crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not mix spaces and TABs for indentation. 

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20284 282e977c-c81d-0410-88c4-b93c2d0d6712
master
akirschbaum 2016-06-19 15:12:01 +00:00
parent 8a34bc3d67
commit 591b77cb83
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
python/misc/swallow_whole.py
View File

@ -11,30 +11,30 @@ r = random.random()
if (r <= 0.26): if (r <= 0.26):
if (me.__class__ is Crossfire.Player): if (me.__class__ is Crossfire.Player):
isplayer = 1 isplayer = 1
elif (me.Alive == True): elif (me.Alive == True):
isplayer = 0 isplayer = 0
else: else:
isplayer = 2 isplayer = 2
if isplayer == 1: if isplayer == 1:
me.Map.Print("\nYou are swallowed whole by the %s!" % (worm.Name)) me.Map.Print("\nYou are swallowed whole by the %s!" % (worm.Name))
map = Crossfire.ReadyMap(eatmap) map = Crossfire.ReadyMap(eatmap)
if map: if map:
me.Teleport(map, eat_x, eat_y) me.Teleport(map, eat_x, eat_y)
else: else:
Crossfire.Log(Crossfire.LogError, "There is no eat map") Crossfire.Log(Crossfire.LogError, "There is no eat map")
elif isplayer == 0: elif isplayer == 0:
me.Map.Print("\nThe %s is swallowed whole by the %s!" % (me.Name, worm.Name)) me.Map.Print("\nThe %s is swallowed whole by the %s!" % (me.Name, worm.Name))
while (me.Inventory is not None): while (me.Inventory is not None):
me.Inventory.InsertInto(worm) me.Inventory.InsertInto(worm)
mexists = Crossfire.WhoIsOther() mexists = Crossfire.WhoIsOther()
if mexists: if mexists:
me.Remove() me.Remove()
else: else:
worm.Map.Print('doesnt exist') worm.Map.Print('doesnt exist')
else: else:
me.Map.Print("\nThe %s misses the %s" % (worm.Name, me.Name)) me.Map.Print("\nThe %s misses the %s" % (worm.Name, me.Name))

2
templates/guild/convertall.py
View File

@ -15,4 +15,4 @@ t.close()
b=a.split('\n') b=a.split('\n')
for c in b: for c in b:
print c + local_copy print c + local_copy
os.system('./convert.py '+c + local_copy) os.system('./convert.py '+c + local_copy)