Run whitespace cleanup script in maps/python.
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11283 282e977c-c81d-0410-88c4-b93c2d0d6712master
parent
aa0729ab16
commit
fdbcb1b6ff
|
@ -63,4 +63,3 @@ class CFBank:
|
|||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
||||
|
|
|
@ -154,4 +154,3 @@ class CFData:
|
|||
keys.remove('#')
|
||||
keys.sort()
|
||||
return keys
|
||||
|
||||
|
|
|
@ -357,4 +357,3 @@ class Dialog:
|
|||
finished = finished + ";"
|
||||
finished = finished + key + ":" + value
|
||||
self.__character.WriteKey("dialog_" + self.__location, finished, 1)
|
||||
|
||||
|
|
|
@ -49,4 +49,3 @@ class SlotMachine:
|
|||
elif limit < self.minpot:
|
||||
self.slotdb[self.slotname] = self.minpot
|
||||
return self.slotdb[self.slotname]
|
||||
|
||||
|
|
|
@ -24,4 +24,3 @@ activator = Crossfire.WhoIsActivator()
|
|||
|
||||
log = CFLog.CFLog()
|
||||
log.kick_update(activator.Name)
|
||||
|
||||
|
|
|
@ -32,4 +32,3 @@ if total > 0:
|
|||
activator.Write('You have some mail waiting for you')
|
||||
else:
|
||||
activator.Write('No mail...')
|
||||
|
||||
|
|
|
@ -168,8 +168,3 @@ Update 04-11-21
|
|||
|
||||
Ok, I've done a bit more work and implemented guild ranks, status and various other gizmos. I changed the list function in CFDataFile to use dictionary keys instead of iteration because python 2.1 does not have dictionary sequence method and as I've said I want to keep crossfire 2.1 compatible (at least till Debian Sarge is mainstream anyway). I've also started on python scripts for buying a guild, a guildhouses info board which will show scores and stuff and a tiny bit of the Dues stuff. I think I would like to place some 'tokens' for some of the bigger guild enhancements (like the kennels, the garden, additional levels...) on the HQ map itself and make them accessable (a scripted lever perhaps) only when a certain number of dues have been paid by the members (many many imperials perhaps?) Naturally other things should be quest items.
|
||||
I noticed that the guild master message board was changed to a second guild controll station and the guild message board in the HQ was changed to a GM message board - perhaps this was a misunderstanding? The GM board is for GM messages and the other is for the regular members. Also the cauldrons on the second floor don't seem to have a way to buy entry anymore. I don't know if the charging room should be key driven because keys are easily lended out and can't be recovered unless the lendee want's to return them, maybe we can use Rank for this (only guildsmen or above get access) or use a permemant maker instead of a key. I also want to do away with the keys altogether and make the code initiate the three guild masters when the guild I bought.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -85,4 +85,3 @@ else:
|
|||
message = 'Guild Guardian Error, please notify a DM'
|
||||
|
||||
whoami.Say(message)
|
||||
|
||||
|
|
|
@ -18,5 +18,3 @@ if points:
|
|||
pass
|
||||
else:
|
||||
print 'Error, no points specified in %s on map %s' %(whoami,mapname)
|
||||
|
||||
|
||||
|
|
|
@ -19,4 +19,3 @@ for guild in guildlist:
|
|||
standings.sort(mycmp)
|
||||
for item in standings:
|
||||
activator.Write('%s - %s - %s' %(item[1],item[0],item[2]))
|
||||
|
||||
|
|
|
@ -54,5 +54,3 @@ else:
|
|||
message = 'Guild Purchase Error, please notify a DM'
|
||||
|
||||
whoami.Say(message)
|
||||
|
||||
|
||||
|
|
|
@ -60,5 +60,3 @@ else:
|
|||
message = 'Guild Join Error, please notify a DM'
|
||||
|
||||
whoami.Say(message)
|
||||
|
||||
|
||||
|
|
|
@ -155,4 +155,3 @@ if (guildname):
|
|||
else:
|
||||
message = 'Board Error'
|
||||
whoami.Say(message)
|
||||
|
||||
|
|
|
@ -89,4 +89,3 @@ if got == 0:
|
|||
do_release(1)
|
||||
else:
|
||||
do_absorb(got)
|
||||
|
||||
|
|
|
@ -93,4 +93,3 @@ elif event.Subtype == Crossfire.EventType.TIME:
|
|||
if whoami.ReadKey('examining_item') == '1':
|
||||
#No moving while examining.
|
||||
Crossfire.SetReturnValue(1)
|
||||
|
||||
|
|
|
@ -58,4 +58,3 @@ elif event.Subtype == Crossfire.EventType.TIME:
|
|||
if whoami.ReadKey('examining_item') == '1':
|
||||
#No moving while examining.
|
||||
Crossfire.SetReturnValue(1)
|
||||
|
||||
|
|
|
@ -25,4 +25,3 @@ if option:
|
|||
tag = activator.CreateInvisibleObjectInside(option)
|
||||
tag.Name=option
|
||||
#Crossfire.Log(Crossfire.LogDebug, "adding tag")
|
||||
|
||||
|
|
|
@ -150,4 +150,3 @@ for jsonRule in parameters["rules"]:
|
|||
|
||||
if speech.speak(Crossfire.WhatIsMessage()) == 0:
|
||||
Crossfire.SetReturnValue(1)
|
||||
|
||||
|
|
|
@ -38,4 +38,3 @@ if (r <= 0.26):
|
|||
worm.Map.Print('doesnt exist')
|
||||
else:
|
||||
me.Map.Print("\nThe %s misses the %s" % (worm.Name, me.Name))
|
||||
|
||||
|
|
|
@ -51,4 +51,3 @@ elif string.lower(parameters["match"]) == "all":
|
|||
Crossfire.SetReturnValue(inverse)
|
||||
else:
|
||||
Crossfire.Log(Crossfire.LogError,"Script filter.py didn't get a 'match' parameter. Only got %s" %parameters)
|
||||
|
||||
|
|
|
@ -83,4 +83,3 @@ if ( (not match) & alreadymatched):
|
|||
map = op.Map
|
||||
map.TriggerConnected(connected,0,Crossfire.WhoAmI())
|
||||
event.Value=0
|
||||
|
||||
|
|
|
@ -73,4 +73,3 @@ if ( match != alreadymatched ):
|
|||
event.Value=1
|
||||
current.Sleeping=1
|
||||
Crossfire.Log(Crossfire.LogDebug, "Put %s to sleep" %current.Name)
|
||||
|
||||
|
|
Loading…
Reference in New Issue