tag: Release_0-3-3
commit a9e239551d47f9d9924d9b9db5752fb3bde7e4e6
Author: Kai Sterker <[email protected]>
Commit: Kai Sterker <[email protected]>
FIXED Bjarn walking around after he starts crying
FIXED player schedule disabled after loading from start screen/quick loading
ADDED a little short cut to Jelom's dialogue
---
scripts/dialogues/jelom_start.py | 9 ++++++---
scripts/init.py | 3 +++
scripts/schedules/mapcharacters/extro.py | 1 +
scripts/schedules/mapcharacters/jelom.py | 2 +-
scripts/schedules/mapcharacters/to_cellar.py | 4 ++--
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/scripts/dialogues/jelom_start.py b/scripts/dialogues/jelom_start.py
index 54283b9..d361c8b 100644
--- a/scripts/dialogues/jelom_start.py
+++ b/scripts/dialogues/jelom_start.py
@@ -59,7 +59,8 @@ class jelom_start (dialogue.base):
_("You investigate the theft? You don't look at all like the
officer I sent Bregon for. What makes you believe you could meddle in my
affairs?"),\
_("My mistress has been wrongly accused, and I intend to clear
her name."),\
_("Listen, Half-Elf! The theft and any investigations are
business of the guard and none of yours! But by the looks of it, the only way
to keep your nose out would be to lock you up."),\
- _("So I won't prevent you from pestering the folk at the Inn.
But should you find out anything, you report to me, you understand! Now, what
is it you want from me?")]
+ _("So I won't prevent you from pestering the folk at the Inn.
But should you find out anything, you report to me, you understand! Now, what
is it you want from me?"),\
+ _("I actually have found out something that should interest
you.")]
cond = [\
"self.the_player.get_val (\"at_silverhairs_door\") == 1 and
adonthell.gamedata_get_quest(\"demo\").get_val (\"know_jelom\") != 2\n",\
@@ -72,7 +73,8 @@ class jelom_start (dialogue.base):
"adonthell.gamedata_get_quest(\"demo\").get_val
(\"know_alek_eavesdrop\") == 1 and
adonthell.gamedata_get_quest(\"demo\").get_val (\"know_talan_singing\") !=
2\n",\
"adonthell.gamedata_get_quest(\"demo\").get_val
(\"know_talan_singing\") != 2\n",\
"adonthell.gamedata_get_quest(\"demo\").get_val
(\"know_talan_singing\") == 2 and self.the_npc.get_val (\"not_convinced\") ==
1\n",\
- "self.the_npc.get_val (\"allows_meddling\") == 0\n"]
+ "self.the_npc.get_val (\"allows_meddling\") == 0\n",\
+ "adonthell.gamedata_get_quest(\"demo\").get_val
(\"know_talan_singing\") == 2 and
adonthell.gamedata_get_quest(\"demo\").get_val (\"know_olivers_noise\") == 1\n"]
code = [\
"adonthell.gamedata_get_quest(\"demo\").set_val
(\"told_on_talan\" , 1)\n",\
@@ -137,7 +139,8 @@ class jelom_start (dialogue.base):
("Default", -1, ((52, 0, -1), )),\
(None, -1, ((53, 0, 10), )),\
("Default", 4, ((54, 0, -1), )),\
- ("Default", -1, ((23, 0, 7), (22, 0, 6), (29, 0, 8), ))]
+ ("Default", -1, ((55, 0, 11), (23, 0, 7), (22, 0, 6), (29, 0,
8), )),\
+ (None, -1, ((13, 0, -1), ))]
def __init__(self, p, n):
diff --git a/scripts/init.py b/scripts/init.py
index 01f1577..d1fd17f 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -181,6 +181,8 @@ class title_screen:
# -- Load game
elif retval == 2:
+ adonthell.gamedata_player ().set_schedule_active (1)
+
self.window.set_visible (0)
self.cleanup ()
adonthell.gamedata_engine ().mapview_start ()
@@ -226,5 +228,6 @@ if adonthell.gamedata_load_newest () == 0:
title = title_screen ()
else:
# -- Quick-load
+ adonthell.gamedata_player ().set_schedule_active (1)
adonthell.gametime_start_action ()
adonthell.gamedata_engine ().main ()
diff --git a/scripts/schedules/mapcharacters/extro.py
b/scripts/schedules/mapcharacters/extro.py
index b189a34..fad697b 100644
--- a/scripts/schedules/mapcharacters/extro.py
+++ b/scripts/schedules/mapcharacters/extro.py
@@ -242,6 +242,7 @@ class extro:
bjarn = self.text[3][0]
bjarn.go_south ()
bjarn.load ('bjarn_crying.mchar')
+ bjarn.pause ()
talan = adonthell.gamedata_get_character ('Talan Wendth')
talan.load ("talan_beaten.mchar")
diff --git a/scripts/schedules/mapcharacters/jelom.py
b/scripts/schedules/mapcharacters/jelom.py
index 97eba02..62c6923 100644
--- a/scripts/schedules/mapcharacters/jelom.py
+++ b/scripts/schedules/mapcharacters/jelom.py
@@ -48,4 +48,4 @@ class jelom (schedule.speak):
def start_talking (self):
self.myself.launch_action (adonthell.gamedata_player ())
adonthell.gamedata_get_character ("Erek Stonebreaker").pause ()
-
+ adonthell.gamedata_get_quest ("demo").set_val ("convince_jelom", 3)
diff --git a/scripts/schedules/mapcharacters/to_cellar.py
b/scripts/schedules/mapcharacters/to_cellar.py
index fff4fbf..71fb4b5 100644
--- a/scripts/schedules/mapcharacters/to_cellar.py
+++ b/scripts/schedules/mapcharacters/to_cellar.py
@@ -51,11 +51,11 @@ class to_cellar:
self.myself.set_callback (self.goal_reached)
submap = self.myself.mymap ().get_submap (self.myself.submap ())
- x = random.randint (1, 4)
+ x = random.randint (2, 5)
y = random.randint (5, 9)
while not submap.get_square (x, y).is_free () or (y == 5 and x >
2):
- x = random.randint (1, 4)
+ x = random.randint (2, 5)
y = random.randint (5, 9)
# -- calculate direction
_______________________________________________
Adonthell-commits mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/adonthell-commits
