From 32e9cfab2cb3db151dba42d16d9170a43d548029 Mon Sep 17 00:00:00 2001 From: temitchell Date: Mon, 6 Dec 2004 04:48:06 +0000 Subject: [PATCH] - remove item scripts long ago moved into items - update scripts to remove path (init script does it for us) git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3003 282e977c-c81d-0410-88c4-b93c2d0d6712 --- python/IPO/banksay.py | 4 --- python/IPO/board.py | 4 --- python/IPO/receive.py | 4 --- python/IPO/say.py | 7 +---- python/IPO/seen.py | 6 ---- python/IPO/send.py | 4 --- python/casino/diamondslots.py | 3 -- python/casino/goldslots.py | 3 -- python/casino/imperialslots.py | 3 -- python/casino/platinumslots.py | 3 -- python/casino/silverslots.py | 3 -- python/items/ring_occidental_mages.py | 1 - python/items/weapon_occidental_mages.py | 1 - python/misc/CFInsulter.py | 19 +++++++++---- python/misc/CFweardisguise.py | 3 -- python/ring_occidental_mages.py | 33 --------------------- python/weapon_occidental_mages.py | 38 ------------------------- 17 files changed, 14 insertions(+), 125 deletions(-) delete mode 100644 python/ring_occidental_mages.py delete mode 100644 python/weapon_occidental_mages.py diff --git a/python/IPO/banksay.py b/python/IPO/banksay.py index a5761f718..b1945cb8f 100644 --- a/python/IPO/banksay.py +++ b/python/IPO/banksay.py @@ -24,10 +24,6 @@ import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) - import string import random import CFBank diff --git a/python/IPO/board.py b/python/IPO/board.py index f9668b961..13ed1fa6e 100755 --- a/python/IPO/board.py +++ b/python/IPO/board.py @@ -24,10 +24,6 @@ import CFPython import CFBoard - -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) import string board = CFBoard.CFBoard() diff --git a/python/IPO/receive.py b/python/IPO/receive.py index c6bc89775..585581ff2 100755 --- a/python/IPO/receive.py +++ b/python/IPO/receive.py @@ -21,10 +21,6 @@ #Updated to use new path functions in CFPython -Todd Mitchell import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) - import CFMail import string diff --git a/python/IPO/say.py b/python/IPO/say.py index ec7f77830..a168ed673 100755 --- a/python/IPO/say.py +++ b/python/IPO/say.py @@ -32,11 +32,6 @@ priceScrollOfLiteracy=5000 priceMailScroll=5 import CFPython - -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) - import string import CFLog @@ -50,7 +45,7 @@ log = CFLog.CFLog() text = string.split(CFPython.WhatIsMessage()) if text[0] == 'help' or text[0] == 'yes': - message = 'How can I help you ? Here is a quick list of commands:\n\n- pen (%s platinum)\n- literacy (%s platinum)\n- mailscroll (%s platinum)\n- seen (free)\n'%(priceWritingPen,priceScrollOfLiteracy,priceMailScroll) + message = 'How can I help you ? Here is a quick list of commands:\n\n- pen (%s platinum)\n- literacy (%s platinum)\n- mailscroll (%s platinum)\n'%(priceWritingPen,priceScrollOfLiteracy,priceMailScroll) CFPython.Say(whoami,message) elif text[0] == 'pen': diff --git a/python/IPO/seen.py b/python/IPO/seen.py index 3f66a68ef..23418eea0 100644 --- a/python/IPO/seen.py +++ b/python/IPO/seen.py @@ -23,13 +23,7 @@ # seen - tells player information from logger import CFPython - -import sys import string -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) - - import CFLog activator=CFPython.WhoIsActivator() diff --git a/python/IPO/send.py b/python/IPO/send.py index 1ddcf503c..e5650a36d 100755 --- a/python/IPO/send.py +++ b/python/IPO/send.py @@ -21,10 +21,6 @@ #Updated to use new path functions in CFPython -Todd Mitchell import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) - import CFMail import string from time import localtime, strftime, time diff --git a/python/casino/diamondslots.py b/python/casino/diamondslots.py index 4179a4023..c83524945 100644 --- a/python/casino/diamondslots.py +++ b/python/casino/diamondslots.py @@ -4,9 +4,6 @@ #FYI - This one uses an object for cointype and not the money code :) import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) import CFGamble import CFItemBroker diff --git a/python/casino/goldslots.py b/python/casino/goldslots.py index cdbfa90b2..017360c6e 100644 --- a/python/casino/goldslots.py +++ b/python/casino/goldslots.py @@ -3,9 +3,6 @@ # Standard type Gold Slots import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) import CFGamble import CFItemBroker diff --git a/python/casino/imperialslots.py b/python/casino/imperialslots.py index 4a021a002..33c07310b 100644 --- a/python/casino/imperialslots.py +++ b/python/casino/imperialslots.py @@ -4,9 +4,6 @@ #FYI - This one uses an object for cointype and not the money code :) import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) import CFGamble import CFItemBroker diff --git a/python/casino/platinumslots.py b/python/casino/platinumslots.py index 2a37df05e..69e266328 100644 --- a/python/casino/platinumslots.py +++ b/python/casino/platinumslots.py @@ -3,9 +3,6 @@ # Standard type Platinum Slots import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) import CFGamble import CFItemBroker diff --git a/python/casino/silverslots.py b/python/casino/silverslots.py index 0d5324b86..c9c592bb7 100644 --- a/python/casino/silverslots.py +++ b/python/casino/silverslots.py @@ -2,9 +2,6 @@ #to make a new kind of slot machine, copy this file, change the settings and point the slotmachine to the new file. import CFPython -import sys -import os.path -sys.path.append(os.path.join(CFPython.GetDataDirectory(),CFPython.GetMapDirectory(),'python')) import CFGamble import CFItemBroker diff --git a/python/items/ring_occidental_mages.py b/python/items/ring_occidental_mages.py index c2eabe3a8..93f62bae0 100644 --- a/python/items/ring_occidental_mages.py +++ b/python/items/ring_occidental_mages.py @@ -1,5 +1,4 @@ import CFPython -import sys import random me = CFPython.WhoAmI() diff --git a/python/items/weapon_occidental_mages.py b/python/items/weapon_occidental_mages.py index c98d86bf0..cae6c8129 100644 --- a/python/items/weapon_occidental_mages.py +++ b/python/items/weapon_occidental_mages.py @@ -1,5 +1,4 @@ import CFPython -import sys import random me = CFPython.WhoAmI() diff --git a/python/misc/CFInsulter.py b/python/misc/CFInsulter.py index 404300aac..9aa3b642a 100644 --- a/python/misc/CFInsulter.py +++ b/python/misc/CFInsulter.py @@ -11,8 +11,6 @@ # Please help by adding new styles of insults to this fine script. import CFPython -import sys -sys.path.append('%s/%s/python' %(CFPython.GetDataDirectory(),CFPython.GetMapDirectory())) from random import choice def Insult(style): @@ -29,11 +27,20 @@ def Insult(style): ##TEXAS STYLE elif style == "texas": - adj1 = ['stewpid', 'uglee', 'pea brained', 'dung-headed', 'hatless', 'witless', 'dumb'] - adj2 = ['horse-knappin', 'hog-licking', 'knock-kneed', 'brown-nosed', 'lilly-livered' ] + adj1 = ['stewpid', 'uglee', 'pea brained', 'dung-headed', 'beady-eyed', 'hatless', 'witless', 'dumb'] + adj2 = ['horse-knappin', 'hog-lickin', 'knock-kneed', 'jug-eared', 'pie-headed', 'snaggle-toothed', 'brown-nosed', 'lilly-livered' ] noun = ['dipshit', 'city-slicker', 'root-head', 'cow-pie', 'greenhorn', 'idgit'] prefixA = ['Yer a','Yer Mama\'s a', 'Yew'] - prefixAn = ['Yer a', 'Yer Mama\'s a', 'Yew'] + prefixAn = ['Yer an', 'Yer Mama\'s an', 'Yew'] + +##DWARVEN STYLE + + elif style == "dwarf": + adj1 = ['beardless', 'puny', 'shaven'] + adj2 = ['elf-footed', 'dull-axed', 'tin-shielded' ] + noun = ['orc-lover', 'gobiln-kisser', 'tree-embracer'] + prefixA = ['You are a','Your Matron\'s a', 'You'] + prefixAn = ['You are an', 'Your Matron\'s an', 'You'] ##NO STYLE else: @@ -61,4 +68,4 @@ whoami=CFPython.WhoAmI() #style of insult desired to hurl in event options style = CFPython.GetEventOptions(whoami,1) # 1 is apply event -CFPython.Write(Insult(style),activator) \ No newline at end of file +CFPython.Write(Insult(style),activator) diff --git a/python/misc/CFweardisguise.py b/python/misc/CFweardisguise.py index 2bf122c45..7c4015afc 100644 --- a/python/misc/CFweardisguise.py +++ b/python/misc/CFweardisguise.py @@ -9,9 +9,6 @@ import CFPython -import sys -sys.path.append('%s/%s/python' %(CFPython.GetDataDirectory(),CFPython.GetMapDirectory())) - activator=CFPython.WhoIsActivator() activatorname=CFPython.GetName(activator) whoami=CFPython.WhoAmI() diff --git a/python/ring_occidental_mages.py b/python/ring_occidental_mages.py deleted file mode 100644 index c2eabe3a8..000000000 --- a/python/ring_occidental_mages.py +++ /dev/null @@ -1,33 +0,0 @@ -import CFPython -import sys -import random - -me = CFPython.WhoAmI() -ac = CFPython.WhoIsActivator() -r = random.random() - -if (CFPython.IsApplied(me)): - if (r <= 0.01): - CFPython.SetIdentified(me,0) - CFPython.SetCursed(me, 1) - CFPython.SetDexterity(me, CFPython.GetDexterity(me)+1) - elif (r <= 0.02): - CFPython.SetIdentified(me,0) - CFPython.SetCursed(me, 1) - CFPython.SetIntelligence(me, CFPython.GetIntelligence(me)+1) - elif (r <= 0.03): - CFPython.SetIdentified(me,0) - CFPython.SetCursed(me, 1) - CFPython.SetConstitution(me, CFPython.GetConstitution(me)+1) - elif (r >= 0.99): - CFPython.SetIdentified(me,0) - CFPython.SetCursed(me, 1) - CFPython.SetDexterity(me, CFPython.GetDexterity(me)-1) - elif (r >= 0.98): - CFPython.SetIdentified(me,0) - CFPython.SetCursed(me, 1) - CFPython.SetIntelligence(me, CFPython.GetIntelligence(me)-1) - elif (r >= 0.97): - CFPython.SetIdentified(me,0) - CFPython.SetCursed(me, 1) - CFPython.SetConstitution(me, CFPython.GetConstitution(me)-1) diff --git a/python/weapon_occidental_mages.py b/python/weapon_occidental_mages.py deleted file mode 100644 index c98d86bf0..000000000 --- a/python/weapon_occidental_mages.py +++ /dev/null @@ -1,38 +0,0 @@ -import CFPython -import sys -import random - -me = CFPython.WhoAmI() -ac = CFPython.WhoIsActivator() -r = random.random() - -if (r <= 0.01): - CFPython.Write("Your weapon suddenly seems lighter !",ac) - CFPython.SetDamage(me,CFPython.GetDamage(me)+10) - CFPython.SetIdentified(me,0) - CFPython.SetBeenApplied(me,0) -elif (r <= 0.02): - CFPython.Write("Your weapon suddenly seems darker !",ac) - CFPython.SetDamage(me,CFPython.GetDamage(me)-10) - CFPython.SetIdentified(me,0) - CFPython.SetBeenApplied(me,0) -elif (r <= 0.03): - CFPython.Write("Your weapon suddenly seems lighter !",ac) - CFPython.SetDamage(me,CFPython.GetDamage(me)+10) - CFPython.SetIdentified(me,0) - CFPython.SetBeenApplied(me,0) -elif (r <= 0.04): - CFPython.Write("Your weapon suddenly seems colder !",ac) - CFPython.SetAttackType(me,CFPython.AttackTypeCold() + CFPython.AttackTypePhysical()) - CFPython.SetIdentified(me,0) - CFPython.SetBeenApplied(me,0) -elif (r <= 0.05): - CFPython.Write("Your weapon suddenly seems warmer !",ac) - CFPython.SetAttackType(me,CFPython.AttackTypeFire() + CFPython.AttackTypePhysical()) - CFPython.SetIdentified(me,0) - CFPython.SetBeenApplied(me,0) -elif (r <= 0.06): - CFPython.Write("Your weapon suddenly emits sparks !",ac) - CFPython.SetAttackType(me,CFPython.AttackTypeElectricity() + CFPython.AttackTypePhysical()) - CFPython.SetIdentified(me,0) - CFPython.SetBeenApplied(me,0)