[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] remove_sdl1_2 8d0eadc 26/29: FIXED Erek p
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] remove_sdl1_2 8d0eadc 26/29: FIXED Erek potentially getting stuck in cellar hallway (hopefully!) |
Date: |
Mon, 25 Jul 2016 18:16:09 +0000 (UTC) |
tag: remove_sdl1_2
commit 8d0eadc73eed006ed4bb28ccfebabf7dae1a40fd
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED Erek potentially getting stuck in cellar hallway (hopefully!)
---
scripts/schedules/mapcharacters/erek.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/scripts/schedules/mapcharacters/erek.py
b/scripts/schedules/mapcharacters/erek.py
index c127703..8ae3137 100755
--- a/scripts/schedules/mapcharacters/erek.py
+++ b/scripts/schedules/mapcharacters/erek.py
@@ -52,7 +52,6 @@ class erek (schedule.speak):
(12, 1, adonthell.STAND_NORTH), \
(2, 4, adonthell.STAND_SOUTH)]
- self.index = 0
self.walk_delay = "45t"
if self.myself.get_val ("goto") != 0:
@@ -89,11 +88,12 @@ class erek (schedule.speak):
# -- set alternative schedule
self.myself.set_callback (self.leave_cellar)
- x, y, dir = self.to_common[self.index]
+ x, y, dir = self.to_common[0]
self.myself.set_goal (x, y, dir)
+ self.myself.set_val ("index", 0)
def leave_cellar (self):
- self.index = self.index + 1
+ index = self.myself.get_val ("index") + 1
goto = self.myself.get_val ("goto")
# -- goto first floor
@@ -101,9 +101,10 @@ class erek (schedule.speak):
# -- goto common room
else: coords = self.to_common
- if self.index < len (coords):
- x, y, dir = coords[self.index]
+ if index < len (coords):
+ x, y, dir = coords[index]
self.myself.set_goal (x, y, dir)
+ self.myself.set_val ("index", index)
# -- arrived
else:
- [adonthell-wastesedge-commits] remove_sdl1_2 8aa7e16 01/29: UPDATED installer script for Waste's Edge v0.3.4 and NSIS 2.x, (continued)
- [adonthell-wastesedge-commits] remove_sdl1_2 8aa7e16 01/29: UPDATED installer script for Waste's Edge v0.3.4 and NSIS 2.x, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 8f52c98 04/29: FIXED compile error (thanks Clément Plantier), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 b673eec 07/29: UPDATED for adonthell version 0.3.5, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 bca7c91 10/29: UPDATED configure.in to use sed instead of more (Thanks Mathieu!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 c27acc3 09/29: ADDED wastesedge.desktop file (Thanks Mathieu!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 98147de 27/29: FIXED extro cutscene not running smoothly and not quite in sync with music, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 7a67abf 18/29: FIXED running with Python 2.x, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 89bc14a 17/29: ADDED settings screen to toggle Fullscreen/Window mode, Music Volume and Language, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 26039dc 28/29: ADDED abilitiy to skip forest sequence and credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 172fa18 13/29: FIXED typo in dialogue (thanks Joe!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] remove_sdl1_2 8d0eadc 26/29: FIXED Erek potentially getting stuck in cellar hallway (hopefully!),
Kai Sterker <=