From 591b77cb83772a40243a7b2792b4145d2de4fe44 Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Sun, 19 Jun 2016 15:12:01 +0000 Subject: [PATCH] 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 --- python/misc/swallow_whole.py | 34 +++++++++++++++++----------------- templates/guild/convertall.py | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/python/misc/swallow_whole.py b/python/misc/swallow_whole.py index 2026d4c6d..1fa227bab 100644 --- a/python/misc/swallow_whole.py +++ b/python/misc/swallow_whole.py @@ -11,30 +11,30 @@ r = random.random() if (r <= 0.26): if (me.__class__ is Crossfire.Player): - isplayer = 1 + isplayer = 1 elif (me.Alive == True): - isplayer = 0 + isplayer = 0 else: - isplayer = 2 + isplayer = 2 if isplayer == 1: - me.Map.Print("\nYou are swallowed whole by the %s!" % (worm.Name)) - map = Crossfire.ReadyMap(eatmap) - if map: - me.Teleport(map, eat_x, eat_y) - else: - Crossfire.Log(Crossfire.LogError, "There is no eat map") + me.Map.Print("\nYou are swallowed whole by the %s!" % (worm.Name)) + map = Crossfire.ReadyMap(eatmap) + if map: + me.Teleport(map, eat_x, eat_y) + else: + Crossfire.Log(Crossfire.LogError, "There is no eat map") 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): - me.Inventory.InsertInto(worm) + while (me.Inventory is not None): + me.Inventory.InsertInto(worm) - mexists = Crossfire.WhoIsOther() - if mexists: - me.Remove() - else: - worm.Map.Print('doesnt exist') + mexists = Crossfire.WhoIsOther() + if mexists: + me.Remove() + else: + worm.Map.Print('doesnt exist') else: me.Map.Print("\nThe %s misses the %s" % (worm.Name, me.Name)) diff --git a/templates/guild/convertall.py b/templates/guild/convertall.py index 1f6ebf45a..ba0b4c0f0 100644 --- a/templates/guild/convertall.py +++ b/templates/guild/convertall.py @@ -15,4 +15,4 @@ t.close() b=a.split('\n') for c in b: print c + local_copy - os.system('./convert.py '+c + local_copy) \ No newline at end of file + os.system('./convert.py '+c + local_copy)