tag: Release_0-3-3
commit 66902e16a72e5152864710d54c90c7cb85c4dd05
Author: Kai Sterker <[email protected]>
Commit: Kai Sterker <[email protected]>
FIXED bug of Silverhair not reaching the cellar - this time for real :)
---
scripts/dialogues/jelom_2nd.py | 2 +-
scripts/schedules/mapcharacters/to_cellar.py | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index 8e76b50..8d0b9f2 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -121,7 +121,7 @@ class jelom_2nd (dialogue.base):
# make all dudes go down to Bjarn
shair = adonthell.gamedata_get_character("Imoen Silverhair")
shair.set_schedule ("to_cellar")
- shair.time_callback_string ("2t", "walk")
+ shair.time_callback_string ("3t", "warp")
jelom = adonthell.gamedata_get_character("Jelom Rasgar")
jelom.set_schedule ("to_cellar")
diff --git a/scripts/schedules/mapcharacters/to_cellar.py
b/scripts/schedules/mapcharacters/to_cellar.py
index 71fb4b5..c56f900 100644
--- a/scripts/schedules/mapcharacters/to_cellar.py
+++ b/scripts/schedules/mapcharacters/to_cellar.py
@@ -71,6 +71,12 @@ class to_cellar:
if not self.myself.set_goal (x, y, dir):
self.myself.time_callback ("1t", self.walk)
+ # -- teleport to the next exit
+ def warp (self):
+ x, y, dir = self.exits[self.myself.submap ()]
+ self.myself.jump_to (self.myself.submap (), x, y, dir)
+ self.myself.time_callback ("1t", self.walk)
+
# -- reached Bjarn's room
def goal_reached (self):
if self.myself.get_name () == adonthell.gamedata_player ().get_name ():
@@ -80,4 +86,7 @@ class to_cellar:
bjarn.launch_action (self.myself)
else:
- self.myself.pause ()
+ if self.myself.posx () == 1 and self.myself.posy () == 7:
+ self.walk ()
+ else:
+ self.myself.pause ()
_______________________________________________
Adonthell-commits mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/adonthell-commits
