[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 dfdc8cc 035/237: Finished O
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 dfdc8cc 035/237: Finished Orloth's dialogue |
|
Date: |
Mon, 25 Jul 2016 18:14:55 +0000 (UTC) |
tag: Release_0-3-1
commit dfdc8ccd42ec700faf0ae7ecff74f26502a0a8fb
Author: adondev <adondev>
Commit: adondev <adondev>
Finished Orloth's dialogue
Started to add Erek
---
scripts/dialogues/erek_start.py | 21 +-
scripts/dialogues/orloth_start.py | 953 ++++++++++++++++++-------------------
scripts/init.py | 16 +-
scripts/schedules/Makefile.am | 2 +-
scripts/schedules/erek.py | 75 +++
scripts/schedules/oliver.py | 2 +
6 files changed, 559 insertions(+), 510 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index ee3ac8c..1e713d6 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -17,17 +17,14 @@ class erek_start:
def clear (self):
del self.dialogue
- self.demo = quests["demo"]
-
-
# Returns whom the Player told about his connection
# with Lady Silverhair
def get_right_npc (self):
- if self.demo.get_val ("work_4_shair") & 1 == 1:
+ if quests["demo"].get_val ("work_4_shair") & 1 == 1:
return "Master Orloth"
- elif self.demo.get_val ("work_4_shair") & 2 == 2:
+ elif quests["demo"].get_val ("work_4_shair") & 2 == 2:
return "the mercenary"
else:
@@ -51,7 +48,7 @@ class erek_start:
self.cont.append (-1)
the_npc.set_val ("talked_to", 1)
- if self.demo.get_val ("know_erek") == 1:
+ if quests["demo"].get_val ("know_erek") == 1:
self.player.append (1)
self.cont.append (1)
@@ -60,7 +57,7 @@ class erek_start:
self.player.append (43)
self.cont.append (30)
self.player.append (-1)
- elif the_npc.get_val ("work_4_shair") == 0 and self.get_val
("demo").get_val ("work_4_shair") > 0:
+ elif the_npc.get_val ("work_4_shair") == 0 and quests["demo"].get_val
("work_4_shair") > 0:
self.color = 0
self.npc.append (50)
@@ -464,7 +461,7 @@ class erek_start:
self.cont.append (11)
self.player.append (20)
self.cont.append (12)
- if self.demo.get_val ("know_argument") != 0:
+ if quests["demo"].get_val ("know_argument") != 0:
self.player.append (38)
self.cont.append (26)
@@ -488,9 +485,9 @@ class erek_start:
self.color = the_npc.get_color()
self.npc.append (21)
self.cont.append (-1)
- self.demo.set_val ("know_alek_eavesdrop", 1)
+ quests["demo"].set_val ("know_alek_eavesdrop" , 1)
- if self.demo.get_val ("know_argument") == 0:
+ if quests["demo"].get_val ("know_argument") == 0:
self.player.append (22)
self.cont.append (13)
@@ -540,14 +537,14 @@ class erek_start:
self.player.append (19)
self.cont.append (11)
- if self.demo.get_val ("know_argument") != 0:
+ if quests["demo"].get_val ("know_argument") != 0:
self.player.append (38)
self.cont.append (26)
self.player.append (-1)
def answer3 (self):
- if self.demo.get_val ("work_4_shair") != 0:
+ if quests["demo"].get_val ("work_4_shair") != 0:
self.color = the_npc.get_color()
self.npc.append (6)
diff --git a/scripts/dialogues/orloth_start.py
b/scripts/dialogues/orloth_start.py
index 1044454..0cebdee 100755
--- a/scripts/dialogues/orloth_start.py
+++ b/scripts/dialogues/orloth_start.py
@@ -1,6 +1,6 @@
class orloth_start:
loop = []
- strings = ["This is seemingly the Innkeeper and owner of the place. He
appears to be lost in thought and from his eyes you can see that he hasn't
slept much lately. His worried face brightens up though as you approach, and
his voice is warm and friendly:", "Welcome to Waste's Edge, traveller. Here you
shall find the pleasures of a hot meal and bath if you desire. And safe and
comfortable lodging. Although, I fear, this is no longer granted for sure.
You've chosen troublesome times fo [...]
+ strings = ["This is seemingly the Innkeeper and owner of the place. He
appears to be lost in thought and from his eyes you can see that he hasn't
slept much lately. His worried face brightens up though as you approach, and
his voice is warm and friendly:", "Welcome to Waste's Edge, traveller. Here you
shall find the pleasures of a hot meal and bath if you desire. And safe and
comfortable lodging. Although, I fear, this is no longer granted for sure.
You've chosen troublesome times fo [...]
def set_name (self, new_name):
pass
@@ -12,7 +12,7 @@ class orloth_start:
pass
def __init__(self):
- self.dialogue = [self.start, self.answer0, self.answer1, self.answer3,
self.answer4, self.answer6, self.answer7, self.answer9, self.answer10,
self.answer11, self.answer13, self.answer15, self.answer16, self.answer17,
self.answer19, self.answer20, self.answer22, self.answer23, self.answer25,
self.answer26, self.answer29, self.answer32, self.answer34, self.answer35,
self.answer38, self.answer39, self.answer41, self.answer43, self.answer44,
self.answer46, self.answer48, self.answer4 [...]
+ self.dialogue = [self.start, self.answer0, self.answer1, self.answer3,
self.answer4, self.answer6, self.answer7, self.answer9, self.answer10,
self.answer11, self.answer13, self.answer15, self.answer16, self.answer17,
self.answer18, self.answer20, self.answer21, self.answer22, self.answer24,
self.answer28, self.answer29, self.answer30, self.answer32, self.answer33,
self.answer35, self.answer37, self.answer38, self.answer40, self.answer42,
self.answer43, self.answer45, self.answer4 [...]
def clear (self):
del self.dialogue
@@ -49,469 +49,398 @@ class orloth_start:
self.dialogue[answer]()
def start (self):
- if 1 == 0:
-
- self.color = the_npc.get_color()
- self.npc.append (9)
- self.cont.append (7)
- the_npc.set_val ("talked_about_guests", 1)
-
- self.player.append (-1)
if the_npc.get_val ("talked_to") == 0:
self.color = 0
self.npc.append (0)
self.cont.append (1)
- the_npc.set_val ("talked_to", 1)
+ the_npc.set_val ("talked_to" , 1)
self.first_run = 1
self.player.append (-1)
else:
self.color = the_npc.get_color()
- self.npc.append (37)
+ self.npc.append (31)
self.cont.append (-1)
- self.player.append (46)
- self.cont.append (29)
- self.player.append (88)
- self.cont.append (60)
+ self.player.append (40)
+ self.cont.append (27)
+ self.player.append (81)
+ self.cont.append (59)
self.player.append (-1)
- def answer88 (self):
+ def answer81 (self):
self.color = the_npc.get_color()
- self.npc.append (47)
+ self.npc.append (41)
self.cont.append (-1)
+ self.player.append (46)
+ self.cont.append (31)
if quests["demo"].get_val ("complain_about_wastesedge") == 1:
- self.player.append (48)
- self.cont.append (30)
- if the_npc.get_val ("talked_about_guests") == 1:
-
- self.player.append (54)
- self.cont.append (32)
- if the_npc.get_val ("talked_about_guests") == 0:
-
- self.player.append (52)
- self.cont.append (-1)
- if the_npc.get_val ("talked_about_theft") == 0:
+ self.player.append (42)
+ self.cont.append (28)
+ if the_npc.get_val ("explain_events") == 0:
- self.player.append (51)
- self.cont.append (-1)
- if the_npc.get_val ("talked_about_theft") == 1:
+ self.player.append (45)
+ self.cont.append (30)
+ if the_npc.get_val ("explain_events") == 1 and self.first_run != 1:
- self.player.append (49)
- self.cont.append (31)
+ self.player.append (43)
+ self.cont.append (29)
self.player.append (-1)
- def answer49 (self):
+ def answer43 (self):
self.color = the_npc.get_color()
- self.npc.append (50)
+ self.npc.append (44)
self.cont.append (-1)
- self.player.append (55)
+ self.player.append (48)
+ self.cont.append (32)
+ self.player.append (49)
self.cont.append (33)
- self.player.append (56)
+ self.player.append (50)
self.cont.append (34)
- self.player.append (57)
- self.cont.append (35)
- self.player.append (77)
- self.cont.append (52)
+ self.player.append (70)
+ self.cont.append (51)
self.player.append (-1)
- def answer77 (self):
+ def answer70 (self):
self.color = the_npc.get_color()
- self.npc.append (82)
- self.cont.append (57)
+ self.npc.append (75)
+ self.cont.append (56)
self.player.append (-1)
- def answer82 (self):
+ def answer75 (self):
self.color = the_npc.get_color()
- self.npc.append (83)
- self.cont.append (58)
+ self.npc.append (76)
+ self.cont.append (57)
self.player.append (-1)
- def answer83 (self):
+ def answer76 (self):
self.color = the_npc.get_color()
- self.npc.append (85)
+ self.npc.append (78)
self.cont.append (-1)
- self.player.append (72)
- self.cont.append (48)
+ self.player.append (65)
+ self.cont.append (47)
self.player.append (-1)
- def answer72 (self):
+ def answer65 (self):
self.color = the_npc.get_color()
- self.npc.append (86)
+ self.npc.append (79)
self.cont.append (-1)
- self.player.append (87)
+ self.player.append (80)
self.cont.append (-1)
+ self.player.append (46)
+ self.cont.append (31)
if quests["demo"].get_val ("complain_about_wastesedge") == 1:
- self.player.append (48)
- self.cont.append (30)
- if the_npc.get_val ("talked_about_guests") == 1:
-
- self.player.append (54)
- self.cont.append (32)
- if the_npc.get_val ("talked_about_guests") == 0:
-
- self.player.append (52)
- self.cont.append (-1)
+ self.player.append (42)
+ self.cont.append (28)
self.player.append (-1)
- def answer87 (self):
+ def answer80 (self):
pass
- def answer57 (self):
+ def answer50 (self):
self.color = the_npc.get_color()
- self.npc.append (73)
- self.cont.append (49)
+ self.npc.append (66)
+ self.cont.append (48)
self.player.append (-1)
- def answer73 (self):
+ def answer66 (self):
self.color = the_npc.get_color()
- self.npc.append (74)
- self.cont.append (50)
+ self.npc.append (67)
+ self.cont.append (49)
self.player.append (-1)
- def answer74 (self):
+ def answer67 (self):
self.color = the_npc.get_color()
- self.npc.append (75)
- self.cont.append (51)
+ self.npc.append (68)
+ self.cont.append (50)
self.player.append (-1)
- def answer75 (self):
+ def answer68 (self):
self.color = the_npc.get_color()
- self.npc.append (76)
+ self.npc.append (69)
self.cont.append (-1)
- self.player.append (79)
- self.cont.append (54)
self.player.append (72)
- self.cont.append (48)
+ self.cont.append (53)
+ self.player.append (65)
+ self.cont.append (47)
self.player.append (-1)
- def answer79 (self):
+ def answer72 (self):
self.color = the_npc.get_color()
- self.npc.append (82)
- self.cont.append (57)
+ self.npc.append (75)
+ self.cont.append (56)
self.player.append (-1)
- def answer56 (self):
+ def answer49 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (58)
+ self.cont.append (41)
+ self.player.append (-1)
+
+ def answer58 (self):
self.color = the_npc.get_color()
- self.npc.append (65)
+ self.npc.append (59)
self.cont.append (42)
self.player.append (-1)
- def answer65 (self):
+ def answer59 (self):
self.color = the_npc.get_color()
- self.npc.append (66)
+ self.npc.append (60)
self.cont.append (43)
self.player.append (-1)
- def answer66 (self):
+ def answer60 (self):
self.color = the_npc.get_color()
- self.npc.append (67)
+ self.npc.append (61)
self.cont.append (44)
self.player.append (-1)
- def answer67 (self):
+ def answer61 (self):
self.color = the_npc.get_color()
- self.npc.append (68)
+ self.npc.append (62)
self.cont.append (45)
self.player.append (-1)
- def answer68 (self):
- self.color = the_npc.get_color()
- self.npc.append (69)
- self.cont.append (46)
- self.player.append (-1)
-
- def answer69 (self):
+ def answer62 (self):
self.color = the_npc.get_color()
- self.npc.append (70)
+ self.npc.append (63)
self.cont.append (-1)
+ self.player.append (64)
+ self.cont.append (46)
self.player.append (71)
+ self.cont.append (52)
+ self.player.append (65)
self.cont.append (47)
- self.player.append (78)
- self.cont.append (53)
- self.player.append (72)
- self.cont.append (48)
self.player.append (-1)
- def answer78 (self):
+ def answer71 (self):
self.color = the_npc.get_color()
- self.npc.append (84)
- self.cont.append (59)
+ self.npc.append (77)
+ self.cont.append (58)
self.player.append (-1)
- def answer84 (self):
+ def answer77 (self):
self.color = the_npc.get_color()
- self.npc.append (83)
- self.cont.append (58)
+ self.npc.append (76)
+ self.cont.append (57)
self.player.append (-1)
- def answer71 (self):
+ def answer64 (self):
self.color = the_npc.get_color()
- self.npc.append (73)
- self.cont.append (49)
+ self.npc.append (66)
+ self.cont.append (48)
self.player.append (-1)
- def answer55 (self):
+ def answer48 (self):
self.color = the_npc.get_color()
- self.npc.append (58)
- self.cont.append (36)
+ self.npc.append (51)
+ self.cont.append (35)
self.player.append (-1)
- def answer58 (self):
+ def answer51 (self):
self.color = the_npc.get_color()
- self.npc.append (59)
- self.cont.append (37)
+ self.npc.append (52)
+ self.cont.append (36)
self.player.append (-1)
- def answer59 (self):
+ def answer52 (self):
self.color = the_npc.get_color()
- self.npc.append (60)
- self.cont.append (38)
+ self.npc.append (53)
+ self.cont.append (37)
self.player.append (-1)
- def answer60 (self):
+ def answer53 (self):
self.color = the_npc.get_color()
- self.npc.append (61)
+ self.npc.append (54)
self.cont.append (-1)
- self.player.append (62)
+ self.player.append (55)
+ self.cont.append (38)
+ self.player.append (56)
self.cont.append (39)
- self.player.append (63)
+ self.player.append (57)
self.cont.append (40)
- self.player.append (64)
- self.cont.append (41)
self.player.append (-1)
- def answer64 (self):
+ def answer57 (self):
self.color = the_npc.get_color()
- self.npc.append (86)
+ self.npc.append (79)
self.cont.append (-1)
- self.player.append (87)
+ self.player.append (80)
self.cont.append (-1)
+ self.player.append (46)
+ self.cont.append (31)
if quests["demo"].get_val ("complain_about_wastesedge") == 1:
- self.player.append (48)
- self.cont.append (30)
- if the_npc.get_val ("talked_about_guests") == 1:
-
- self.player.append (54)
- self.cont.append (32)
- if the_npc.get_val ("talked_about_guests") == 0:
-
- self.player.append (52)
- self.cont.append (-1)
+ self.player.append (42)
+ self.cont.append (28)
self.player.append (-1)
- def answer63 (self):
+ def answer56 (self):
self.color = the_npc.get_color()
- self.npc.append (73)
- self.cont.append (49)
+ self.npc.append (66)
+ self.cont.append (48)
self.player.append (-1)
- def answer62 (self):
+ def answer55 (self):
self.color = the_npc.get_color()
- self.npc.append (65)
- self.cont.append (42)
+ self.npc.append (58)
+ self.cont.append (41)
self.player.append (-1)
- def answer51 (self):
- pass
-
- def answer52 (self):
- pass
-
- def answer54 (self):
+ def answer45 (self):
self.color = the_npc.get_color()
- self.npc.append (89)
+ self.npc.append (91)
self.cont.append (-1)
- self.player.append (90)
- self.cont.append (61)
- self.player.append (91)
- self.cont.append (62)
+ the_npc.set_val ("explain_events" , 1)
+
self.player.append (92)
- self.cont.append (63)
+ self.cont.append (66)
self.player.append (93)
- self.cont.append (-1)
+ self.cont.append (67)
self.player.append (-1)
def answer93 (self):
- pass
+ self.color = the_npc.get_color()
+ self.npc.append (94)
+ self.cont.append (68)
+ self.player.append (-1)
- def answer92 (self):
+ def answer94 (self):
self.color = the_npc.get_color()
- self.npc.append (99)
- self.cont.append (-1)
+ self.npc.append (95)
+ self.cont.append (69)
self.player.append (-1)
- def answer91 (self):
+ def answer95 (self):
self.color = the_npc.get_color()
- self.npc.append (97)
- self.cont.append (66)
+ self.npc.append (96)
+ self.cont.append (70)
+ quests["demo"].set_val ("know_argument" , 1)
+
self.player.append (-1)
- def answer97 (self):
+ def answer96 (self):
self.color = the_npc.get_color()
- self.npc.append (98)
+ self.npc.append (97)
self.cont.append (-1)
+ self.player.append (98)
+ self.cont.append (71)
self.player.append (-1)
- def answer90 (self):
+ def answer98 (self):
self.color = the_npc.get_color()
- self.npc.append (94)
- self.cont.append (64)
+ self.npc.append (99)
+ self.cont.append (-1)
+ self.player.append (100)
+ self.cont.append (72)
+ self.player.append (101)
+ self.cont.append (73)
+ self.player.append (102)
+ self.cont.append (74)
self.player.append (-1)
- def answer94 (self):
+ def answer102 (self):
self.color = the_npc.get_color()
- self.npc.append (95)
- self.cont.append (65)
+ self.npc.append (28)
+ self.cont.append (19)
self.player.append (-1)
- def answer95 (self):
+ def answer28 (self):
self.color = the_npc.get_color()
- self.npc.append (96)
- self.cont.append (-1)
+ self.npc.append (29)
+ self.cont.append (20)
self.player.append (-1)
- def answer48 (self):
+ def answer29 (self):
self.color = the_npc.get_color()
- self.npc.append (43)
- self.cont.append (27)
+ self.npc.append (108)
+ self.cont.append (80)
self.player.append (-1)
- def answer43 (self):
+ def answer108 (self):
self.color = the_npc.get_color()
- self.npc.append (44)
- self.cont.append (28)
+ self.npc.append (109)
+ self.cont.append (-1)
+ self.player.append (111)
+ self.cont.append (81)
+ if the_npc.get_val ("introduce_guests") == 0:
+
+ self.player.append (112)
+ self.cont.append (82)
self.player.append (-1)
- def answer44 (self):
+ def answer112 (self):
self.color = the_npc.get_color()
- self.npc.append (80)
- self.cont.append (55)
+ self.npc.append (9)
+ self.cont.append (7)
+ the_npc.set_val ("introduce_guests" , 1)
+
self.player.append (-1)
- def answer80 (self):
+ def answer9 (self):
self.color = the_npc.get_color()
- self.npc.append (81)
- self.cont.append (56)
+ self.npc.append (13)
+ self.cont.append (10)
self.player.append (-1)
- def answer81 (self):
+ def answer13 (self):
self.color = the_npc.get_color()
- self.npc.append (45)
- self.cont.append (-1)
- self.player.append (87)
+ self.npc.append (14)
self.cont.append (-1)
- if the_npc.get_val ("talked_about_guests") == 0:
-
- self.player.append (52)
- self.cont.append (-1)
- if the_npc.get_val ("talked_about_theft") == 1:
+ self.player.append (15)
+ self.cont.append (11)
+ self.player.append (16)
+ self.cont.append (12)
+ self.player.append (-1)
- self.player.append (49)
- self.cont.append (31)
- if the_npc.get_val ("talked_about_theft") == 0:
+ def answer16 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (47)
+ self.cont.append (-1)
+ self.player.append (46)
+ self.cont.append (31)
+ self.player.append (30)
+ self.cont.append (21)
+ if the_npc.get_val ("explain_events") == 1 and self.first_run != 1:
- self.player.append (51)
- self.cont.append (-1)
- if the_npc.get_val ("talked_about_guests") == 1:
+ self.player.append (43)
+ self.cont.append (29)
+ if the_npc.get_val ("explain_events") == 0 and self.first_run == 1:
- self.player.append (54)
- self.cont.append (32)
+ self.player.append (115)
+ self.cont.append (85)
self.player.append (-1)
- def answer46 (self):
+ def answer115 (self):
self.color = the_npc.get_color()
- self.npc.append (47)
+ self.npc.append (91)
self.cont.append (-1)
- if quests["demo"].get_val ("complain_about_wastesedge") == 1:
+ the_npc.set_val ("explain_events" , 1)
- self.player.append (48)
- self.cont.append (30)
- if the_npc.get_val ("talked_about_guests") == 1:
+ self.player.append (92)
+ self.cont.append (66)
+ self.player.append (93)
+ self.cont.append (67)
+ self.player.append (-1)
- self.player.append (54)
- self.cont.append (32)
- if the_npc.get_val ("talked_about_guests") == 0:
+ def answer30 (self):
+ if self.first_run == 1:
- self.player.append (52)
+ self.color = the_npc.get_color()
+ self.npc.append (34)
self.cont.append (-1)
- if the_npc.get_val ("talked_about_theft") == 0:
+ self.player.append (33)
+ self.cont.append (23)
+ if the_npc.get_val ("told_about_shair") == 0:
- self.player.append (51)
- self.cont.append (-1)
- if the_npc.get_val ("talked_about_theft") == 1:
-
- self.player.append (49)
- self.cont.append (31)
- self.player.append (-1)
-
- def answer0 (self):
- self.color = the_npc.get_color()
- self.npc.append (1)
- self.cont.append (2)
- self.player.append (-1)
-
- def answer1 (self):
- self.color = the_npc.get_color()
- self.npc.append (2)
- self.cont.append (-1)
- self.player.append (3)
- self.cont.append (3)
- self.player.append (-1)
-
- def answer3 (self):
- self.color = the_npc.get_color()
- self.npc.append (4)
- self.cont.append (4)
- self.player.append (-1)
-
- def answer4 (self):
- self.color = the_npc.get_color()
- self.npc.append (5)
- self.cont.append (-1)
- self.player.append (6)
- self.cont.append (5)
- self.player.append (7)
- self.cont.append (6)
- self.player.append (-1)
-
- def answer7 (self):
- self.color = the_npc.get_color()
- self.npc.append (8)
- self.cont.append (-1)
- self.player.append (103)
- self.cont.append (68)
- self.player.append (-1)
-
- def answer103 (self):
- self.color = the_npc.get_color()
- self.npc.append (105)
- self.cont.append (-1)
- self.player.append (107)
- self.cont.append (71)
- self.player.append (108)
- self.cont.append (-1)
- self.player.append (106)
- self.cont.append (70)
- self.player.append (-1)
-
- def answer106 (self):
- self.color = the_npc.get_color()
- self.npc.append (40)
- self.cont.append (-1)
- self.player.append (39)
- self.cont.append (25)
- if the_npc.get_val ("told_about_shair") == 0:
-
- self.player.append (38)
- self.cont.append (24)
- self.player.append (-1)
+ self.player.append (32)
+ self.cont.append (22)
+ self.player.append (-1)
- def answer38 (self):
+ def answer32 (self):
the_npc.set_val ("told_about_shair", 1)
myquest = quests["demo"]
myvar = myquest.get_val ("work_4_shair")
@@ -520,15 +449,15 @@ class orloth_start:
self.color = the_npc.get_color()
- self.npc.append (41)
- self.cont.append (26)
+ self.npc.append (35)
+ self.cont.append (24)
self.player.append (-1)
- def answer41 (self):
+ def answer35 (self):
if characters["Oliver Redwyne"].get_val ("talked_to") == 1:
self.color = 0
- self.npc.append (42)
+ self.npc.append (36)
self.cont.append (-1)
characters["Oliver Redwyne"].set_val ("goto_players_room" , 1)
@@ -536,323 +465,367 @@ class orloth_start:
else:
self.color = 0
- self.npc.append (128)
+ self.npc.append (110)
self.cont.append (-1)
characters["Oliver Redwyne"].set_val ("goto_players_room" , 1)
self.player.append (-1)
- def answer39 (self):
+ def answer33 (self):
self.color = the_npc.get_color()
- self.npc.append (41)
- self.cont.append (26)
+ self.npc.append (35)
+ self.cont.append (24)
self.player.append (-1)
- def answer108 (self):
- pass
-
- def answer107 (self):
+ def answer15 (self):
self.color = the_npc.get_color()
- self.npc.append (109)
- self.cont.append (-1)
- self.player.append (110)
- self.cont.append (72)
- self.player.append (111)
- self.cont.append (73)
- self.player.append (-1)
+ self.npc.append (17)
+ self.cont.append (13)
+ quests["demo"].set_val ("know_erek" , 1)
- def answer111 (self):
- self.color = the_npc.get_color()
- self.npc.append (112)
- self.cont.append (74)
self.player.append (-1)
- def answer112 (self):
+ def answer17 (self):
self.color = the_npc.get_color()
- self.npc.append (113)
- self.cont.append (75)
+ self.npc.append (26)
+ self.cont.append (-1)
+ self.player.append (16)
+ self.cont.append (12)
+ self.player.append (114)
+ self.cont.append (84)
+ if quests["demo"].get_val ("know_bjarns_insult") == 0:
+
+ self.player.append (113)
+ self.cont.append (83)
self.player.append (-1)
def answer113 (self):
- self.color = the_npc.get_color()
- self.npc.append (114)
- self.cont.append (76)
- self.player.append (-1)
+ quests["demo"].set_val ("know_bjarns_insult" , 1)
- def answer114 (self):
self.color = the_npc.get_color()
- self.npc.append (115)
- self.cont.append (-1)
- self.player.append (116)
- self.cont.append (77)
+ self.npc.append (18)
+ self.cont.append (14)
self.player.append (-1)
- def answer116 (self):
+ def answer18 (self):
self.color = the_npc.get_color()
- self.npc.append (117)
+ self.npc.append (19)
self.cont.append (-1)
- self.player.append (118)
- self.cont.append (78)
- self.player.append (119)
- self.cont.append (79)
- self.player.append (120)
- self.cont.append (80)
+ self.player.append (20)
+ self.cont.append (15)
+ self.player.append (16)
+ self.cont.append (12)
self.player.append (-1)
- def answer120 (self):
+ def answer20 (self):
self.color = the_npc.get_color()
- self.npc.append (34)
- self.cont.append (22)
+ self.npc.append (21)
+ self.cont.append (16)
self.player.append (-1)
- def answer34 (self):
+ def answer21 (self):
self.color = the_npc.get_color()
- self.npc.append (35)
- self.cont.append (23)
+ self.npc.append (22)
+ self.cont.append (17)
self.player.append (-1)
- def answer35 (self):
+ def answer22 (self):
self.color = the_npc.get_color()
- self.npc.append (126)
- self.cont.append (86)
+ self.npc.append (23)
+ self.cont.append (-1)
+ self.player.append (88)
+ self.cont.append (63)
+ if the_npc.get_val ("explain_events") == 1 and self.first_run != 1:
+
+ self.player.append (43)
+ self.cont.append (29)
+ if the_npc.get_val ("explain_events") == 0 and self.first_run == 1:
+
+ self.player.append (115)
+ self.cont.append (85)
self.player.append (-1)
- def answer126 (self):
+ def answer88 (self):
+ if self.first_run == 1:
+
+ self.color = the_npc.get_color()
+ self.npc.append (34)
+ self.cont.append (-1)
+ self.player.append (33)
+ self.cont.append (23)
+ if the_npc.get_val ("told_about_shair") == 0:
+
+ self.player.append (32)
+ self.cont.append (22)
+ self.player.append (-1)
+
+ def answer114 (self):
self.color = the_npc.get_color()
- self.npc.append (127)
- self.cont.append (-1)
+ self.npc.append (21)
+ self.cont.append (16)
self.player.append (-1)
- def answer119 (self):
+ def answer111 (self):
+ if self.first_run == 1:
+
+ self.color = the_npc.get_color()
+ self.npc.append (34)
+ self.cont.append (-1)
+ self.player.append (33)
+ self.cont.append (23)
+ if the_npc.get_val ("told_about_shair") == 0:
+
+ self.player.append (32)
+ self.cont.append (22)
+ self.player.append (-1)
+
+ def answer101 (self):
self.color = the_npc.get_color()
- self.npc.append (123)
- self.cont.append (83)
+ self.npc.append (105)
+ self.cont.append (77)
self.player.append (-1)
- def answer123 (self):
+ def answer105 (self):
self.color = the_npc.get_color()
- self.npc.append (124)
- self.cont.append (84)
+ self.npc.append (106)
+ self.cont.append (78)
self.player.append (-1)
- def answer124 (self):
+ def answer106 (self):
self.color = the_npc.get_color()
- self.npc.append (125)
- self.cont.append (85)
+ self.npc.append (107)
+ self.cont.append (79)
self.player.append (-1)
- def answer125 (self):
+ def answer107 (self):
self.color = the_npc.get_color()
- self.npc.append (35)
- self.cont.append (23)
+ self.npc.append (29)
+ self.cont.append (20)
self.player.append (-1)
- def answer118 (self):
+ def answer100 (self):
self.color = the_npc.get_color()
- self.npc.append (30)
+ self.npc.append (25)
self.cont.append (-1)
- self.player.append (29)
- self.cont.append (20)
+ quests["demo"].set_val ("know_bjarns_insult" , 1)
+
+ self.player.append (24)
+ self.cont.append (18)
self.player.append (-1)
- def answer29 (self):
+ def answer24 (self):
self.color = the_npc.get_color()
- self.npc.append (121)
- self.cont.append (81)
+ self.npc.append (103)
+ self.cont.append (75)
self.player.append (-1)
- def answer121 (self):
+ def answer103 (self):
self.color = the_npc.get_color()
- self.npc.append (33)
+ self.npc.append (27)
self.cont.append (-1)
- self.player.append (122)
- self.cont.append (82)
- self.player.append (120)
- self.cont.append (80)
+ self.player.append (104)
+ self.cont.append (76)
+ self.player.append (102)
+ self.cont.append (74)
self.player.append (-1)
- def answer122 (self):
+ def answer104 (self):
self.color = the_npc.get_color()
- self.npc.append (123)
- self.cont.append (83)
+ self.npc.append (105)
+ self.cont.append (77)
self.player.append (-1)
- def answer110 (self):
+ def answer92 (self):
self.color = the_npc.get_color()
- self.npc.append (113)
- self.cont.append (75)
+ self.npc.append (95)
+ self.cont.append (69)
self.player.append (-1)
- def answer6 (self):
- the_npc.set_val ("told_about_shair", 1)
- myvar = quests["demo"].get_val ("work_4_shair")
- myvar = myvar | 1
- quests["demo"].set_val ("work_4_shair" , myvar)
-
+ def answer42 (self):
self.color = the_npc.get_color()
- self.npc.append (10)
- self.cont.append (8)
+ self.npc.append (37)
+ self.cont.append (25)
self.player.append (-1)
- def answer10 (self):
+ def answer37 (self):
self.color = the_npc.get_color()
- self.npc.append (100)
- self.cont.append (-1)
- self.player.append (101)
- self.cont.append (67)
- self.player.append (104)
- self.cont.append (69)
+ self.npc.append (38)
+ self.cont.append (26)
self.player.append (-1)
- def answer104 (self):
+ def answer38 (self):
self.color = the_npc.get_color()
- self.npc.append (102)
- self.cont.append (-1)
- self.player.append (11)
- self.cont.append (9)
+ self.npc.append (73)
+ self.cont.append (54)
self.player.append (-1)
- def answer11 (self):
+ def answer73 (self):
self.color = the_npc.get_color()
- self.npc.append (12)
- self.cont.append (-1)
- self.player.append (107)
- self.cont.append (71)
- self.player.append (108)
- self.cont.append (-1)
- self.player.append (106)
- self.cont.append (70)
+ self.npc.append (74)
+ self.cont.append (55)
self.player.append (-1)
- def answer101 (self):
+ def answer74 (self):
self.color = the_npc.get_color()
- self.npc.append (102)
+ self.npc.append (39)
self.cont.append (-1)
- self.player.append (11)
- self.cont.append (9)
+ self.player.append (80)
+ self.cont.append (-1)
+ self.player.append (46)
+ self.cont.append (31)
+ if the_npc.get_val ("explain_events") == 1 and self.first_run != 1:
+
+ self.player.append (43)
+ self.cont.append (29)
+ if the_npc.get_val ("explain_events") == 0:
+
+ self.player.append (45)
+ self.cont.append (30)
self.player.append (-1)
- def answer9 (self):
+ def answer46 (self):
self.color = the_npc.get_color()
- self.npc.append (13)
- self.cont.append (10)
+ self.npc.append (9)
+ self.cont.append (7)
+ the_npc.set_val ("introduce_guests" , 1)
+
self.player.append (-1)
- def answer13 (self):
+ def answer40 (self):
self.color = the_npc.get_color()
- self.npc.append (14)
+ self.npc.append (41)
self.cont.append (-1)
- self.player.append (15)
- self.cont.append (11)
- self.player.append (16)
- self.cont.append (12)
- self.player.append (-1)
-
- def answer16 (self):
- if self.first_run == 1:
-
- self.color = the_npc.get_color()
- self.npc.append (28)
- self.cont.append (-1)
- self.player.append (36)
- self.cont.append (-1)
- self.player.append (-1)
- else:
-
- self.color = the_npc.get_color()
- self.npc.append (53)
- self.cont.append (-1)
- if the_npc.get_val ("talked_about_guests") == 0:
+ self.player.append (46)
+ self.cont.append (31)
+ if quests["demo"].get_val ("complain_about_wastesedge") == 1:
- self.player.append (52)
- self.cont.append (-1)
- if the_npc.get_val ("talked_about_theft") == 1:
+ self.player.append (42)
+ self.cont.append (28)
+ if the_npc.get_val ("explain_events") == 0:
- self.player.append (49)
- self.cont.append (31)
- self.player.append (-1)
+ self.player.append (45)
+ self.cont.append (30)
+ if the_npc.get_val ("explain_events") == 1 and self.first_run != 1:
- def answer36 (self):
- pass
+ self.player.append (43)
+ self.cont.append (29)
+ self.player.append (-1)
- def answer15 (self):
+ def answer0 (self):
self.color = the_npc.get_color()
- self.npc.append (17)
- self.cont.append (13)
+ self.npc.append (1)
+ self.cont.append (2)
self.player.append (-1)
- def answer17 (self):
- if self.fingolson_jest == 1:
-
- self.color = the_npc.get_color()
- self.npc.append (32)
- self.cont.append (21)
- self.player.append (-1)
- else:
+ def answer1 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (2)
+ self.cont.append (-1)
+ self.player.append (3)
+ self.cont.append (3)
+ self.player.append (-1)
- self.color = the_npc.get_color()
- self.npc.append (18)
- self.cont.append (-1)
- self.fingolson_jest = 1
+ def answer3 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (4)
+ self.cont.append (4)
+ self.player.append (-1)
- self.player.append (19)
- self.cont.append (14)
- self.player.append (-1)
+ def answer4 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (5)
+ self.cont.append (-1)
+ self.player.append (6)
+ self.cont.append (5)
+ self.player.append (7)
+ self.cont.append (6)
+ self.player.append (-1)
- def answer19 (self):
+ def answer7 (self):
self.color = the_npc.get_color()
- self.npc.append (20)
- self.cont.append (15)
+ self.npc.append (8)
+ self.cont.append (-1)
+ self.player.append (85)
+ self.cont.append (61)
self.player.append (-1)
- def answer20 (self):
+ def answer85 (self):
self.color = the_npc.get_color()
- self.npc.append (21)
+ self.npc.append (87)
self.cont.append (-1)
- self.player.append (22)
- self.cont.append (16)
- self.player.append (16)
- self.cont.append (12)
+ self.player.append (89)
+ self.cont.append (64)
+ self.player.append (90)
+ self.cont.append (65)
+ self.player.append (88)
+ self.cont.append (63)
self.player.append (-1)
- def answer22 (self):
+ def answer90 (self):
self.color = the_npc.get_color()
- self.npc.append (23)
- self.cont.append (17)
+ self.npc.append (9)
+ self.cont.append (7)
+ the_npc.set_val ("introduce_guests" , 1)
+
self.player.append (-1)
- def answer23 (self):
+ def answer89 (self):
self.color = the_npc.get_color()
- self.npc.append (24)
+ self.npc.append (91)
self.cont.append (-1)
- self.player.append (16)
- self.cont.append (12)
- if self.first_run == 1:
+ the_npc.set_val ("explain_events" , 1)
- self.player.append (25)
- self.cont.append (18)
+ self.player.append (92)
+ self.cont.append (66)
+ self.player.append (93)
+ self.cont.append (67)
self.player.append (-1)
- def answer25 (self):
+ def answer6 (self):
+ the_npc.set_val ("told_about_shair", 1)
+ myvar = quests["demo"].get_val ("work_4_shair")
+ myvar = myvar | 1
+ quests["demo"].set_val ("work_4_shair" , myvar)
+
self.color = the_npc.get_color()
- self.npc.append (26)
- self.cont.append (19)
+ self.npc.append (10)
+ self.cont.append (8)
self.player.append (-1)
- def answer26 (self):
+ def answer10 (self):
self.color = the_npc.get_color()
- self.npc.append (27)
+ self.npc.append (82)
self.cont.append (-1)
- self.player.append (36)
+ self.player.append (83)
+ self.cont.append (60)
+ self.player.append (86)
+ self.cont.append (62)
+ self.player.append (-1)
+
+ def answer86 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (84)
self.cont.append (-1)
+ self.player.append (11)
+ self.cont.append (9)
self.player.append (-1)
- def answer32 (self):
+ def answer11 (self):
self.color = the_npc.get_color()
- self.npc.append (31)
+ self.npc.append (12)
self.cont.append (-1)
- self.player.append (22)
- self.cont.append (16)
- self.player.append (16)
- self.cont.append (12)
+ self.player.append (89)
+ self.cont.append (64)
+ self.player.append (90)
+ self.cont.append (65)
+ self.player.append (88)
+ self.cont.append (63)
+ self.player.append (-1)
+
+ def answer83 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (84)
+ self.cont.append (-1)
+ self.player.append (11)
+ self.cont.append (9)
self.player.append (-1)
diff --git a/scripts/init.py b/scripts/init.py
index dc596b7..d3d9edf 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -470,13 +470,15 @@ if retval < 5:
orloth.stand_south ()
orloth.set_schedule ("orloth")
- # erek = characters ["Erek Stonebreaker"]
- # erek.set_dialogue ("dialogues/erek_start")
- # erek.load ("erek.mchar")
- # erek.set_map (map_engine.get_landmap ())
- # erek.jump_to (1, 5, 5)
- # erek.set_action ("action_talk")
- # erek.stand_north ()
+ # -- that's a clone for now
+ erek = characters ["Erek Stonebreaker"]
+ erek.set_dialogue ("dialogues/erek_start")
+ erek.load ("bjarn.mchar")
+ erek.set_map (map_engine.get_landmap ())
+ erek.jump_to (1, 5, 5)
+ erek.set_action ("action_talk")
+ erek.stand_north ()
+ erek.set_schedule ("erek")
oliver = characters ["Oliver Redwyne"]
oliver.set_dialogue ("dialogues/oliver_start")
diff --git a/scripts/schedules/Makefile.am b/scripts/schedules/Makefile.am
index 2de0d3d..7ec83bd 100755
--- a/scripts/schedules/Makefile.am
+++ b/scripts/schedules/Makefile.am
@@ -1,6 +1,6 @@
pkgdatadir = $(gamedatadir)/scripts/schedules
pkgdata_DATA = action_talk.py center_player.py keyboard_control.py orloth.py \
- sarin.py frostbloom.py silverhair.py oliver.py
+ sarin.py frostbloom.py silverhair.py oliver.py erek.py
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/schedules/erek.py b/scripts/schedules/erek.py
new file mode 100755
index 0000000..d4f8a1a
--- /dev/null
+++ b/scripts/schedules/erek.py
@@ -0,0 +1,75 @@
+#
+# (C) Copyright 2001 Kai Sterker <address@hidden>
+# Part of the Adonthell Project http://adonthell.linuxgames.com
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY.
+#
+# See the COPYING file for more details
+#
+
+# -- Movement schedule for Erek Stonebreaker
+#
+# Erek will either be in the parlour or the common room.
+
+import schedules
+import random
+
+speech = ["How could they do that to the Master?", \
+ "This place is so much different from home.", \
+ "Who could have taken the gems?"]
+
+coords = [(5, 5, STAND_NORTH), \
+ (10, 6, STAND_WEST), \
+ (5, 3, STAND_NORTH), \
+ (4, 5, STAND_SOUTH)]
+
+todo = myself.get_val ("goto_parlour")
+
+# switch places
+if todo == 0:
+ # -- in common room -> goto parlour
+ if myself.submap () == 1 \
+ and schedules.simple_goto_xy (myself, 13, 4) == 1:
+ # since simple_goto_xy only returns 1 if the character
+ # completely occupies the tile, but the enter event is
+ # raised before, we have to do the last step manually.
+ myself.go_east ()
+ delay = random.randint (50, 150) * -30
+ myself.set_val ("goto_parlour", delay)
+ myself.set_val ("goal", random.randint (2, 3))
+
+ # -- in parlour -> goto common room
+ elif schedules.simple_goto_xy (myself, 1, 4) == 1:
+ myself.go_west ()
+ delay = random.randint (50, 150) * 20
+ myself.set_val ("goto_parlour", delay)
+ myself.set_val ("goal", random.randint (0, 1))
+
+# -- walk up to the new pos and stay there
+else:
+ # -- In parlour
+ if todo < 0:
+ myself.set_val ("goto_parlour", todo + 1)
+ # -- In common room
+ else:
+ myself.set_val ("goto_parlour", todo - 1)
+
+ goal = myself.get_val ("goal")
+ x, y, dir = coords[goal]
+
+ if schedules.simple_goto_xy (myself, x, y) == 1:
+ if dir == STAND_NORTH: myself.stand_north ()
+ elif dir == STAND_EAST: myself.stand_east ()
+ elif dir == STAND_SOUTH: myself.stand_south ()
+ else: myself.stand_west ()
+
+# -- do some random babbling
+tmp = myself.get_val ("say_something")
+myself.set_val ("say_something", tmp - 1)
+if tmp == 0:
+ schedules.speak (myself, speech[random.randint (0, 2)])
+ delay = random.randint (60, 180) * 15
+ myself.set_val ("say_something", delay)
diff --git a/scripts/schedules/oliver.py b/scripts/schedules/oliver.py
index 673b1ac..cc57dfa 100755
--- a/scripts/schedules/oliver.py
+++ b/scripts/schedules/oliver.py
@@ -37,6 +37,8 @@ if myself.get_val ("goto_players_room") == 1:
elif myself.get_val ("goto_players_room") == 2:
# -- start talking to the player
myself.launch_action (the_player)
+ # -- does not make a change
+ myself.set_schedule_active (0)
# -- leave the player's room and goto the barn
elif myself.get_val ("goto_barn") == 1:
- [adonthell-wastesedge-commits] Release_0-3-1 21f36d0 059/237: Slight fix., (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 21f36d0 059/237: Slight fix., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b40a92e 134/237: ADDED Lucia's schedule and furnitures, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 64e91d5 033/237: UPDATE to some schedules and dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d6dfa6e 064/237: Added characters portraits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0933dbf 063/237: How could I forget them ... ? ; ), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a681af9 028/237: Modularized event scripts, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 18d2266 131/237: FIXED installation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b028da 127/237: UPDATED intro sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 290bfde 086/237: ADDED portraits of Talan and Player, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furniturized the houses., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dfdc8cc 035/237: Finished Orloth's dialogue,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 398bec8 143/237: IMPROVED Bjarn's dialogue and text bubbles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c0d92f8 138/237: Further cleaning up of dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a1e51e2 061/237: ADDED Jelom, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8dd4ff 133/237: Finished map forest., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bcd3b16 141/237: FIXED previous commit of old stuff, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e167248 062/237: Fixed a bug in displaying bubbles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8e16709 166/237: ADDED some Barn <-> Silverhair teleport magic :), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 793fc3f 150/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 238ff56 140/237: FIXED spelling in init.py, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9cad88a 080/237: Some changes to the dialogues (shortened player answers, splitted long NPC answers, etc.), Kai Sterker, 2016/07/25