[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 4f1725f 119/237: FIXED erek
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 4f1725f 119/237: FIXED erek and jelom |
Date: |
Mon, 25 Jul 2016 18:15:04 +0000 (UTC) |
tag: Release_0-3-1
commit 4f1725fa9e9e7807aa42d3593546866aaee1f1ee
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED erek and jelom
ADDED Jelom's second dialogue
---
scripts/dialogues/erek_start.py | 6 +-
scripts/dialogues/jelom_2nd.py | 246 ++++++++++++++++++++++++++++++++++++++
scripts/dialogues/jelom_start.py | 3 +
3 files changed, 253 insertions(+), 2 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 74be2b8..111cf90 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -126,13 +126,15 @@ class erek_start:
self.player.append (106)
self.cont.append (-1)
- if convince_jelom == 1:
+ if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
self.player.append (105)
self.cont.append (-1)
self.player.append (-1)
def answer105 (self):
+ adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 2)
+
pass
def answer106 (self):
@@ -421,7 +423,7 @@ class erek_start:
self.cont.append (64)
self.player.append (-1)
- def answer238 (self):
+ def answer116 (self):
pass
def answer47 (self):
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
new file mode 100644
index 0000000..7cd0c74
--- /dev/null
+++ b/scripts/dialogues/jelom_2nd.py
@@ -0,0 +1,246 @@
+import adonthell
+
+class jelom_2nd:
+ loop = []
+ strings = ["Back again, Half-Elf? Have you learned anything of
importance from your mistress?", "Nothing you'd be interested in, Jelom.", "It
seems that Fingolson's gems are worthless to her.", "Really? I imagine you have
some sort of proof for this, then?", "I have this Chrysoberyl. Apparently it is
no Catseye, so why should Lady Silverhair have stolen it?", "You mean this is
one of the stolen gems? How in hell did you come across that? And where are the
others?", "I don't know where t [...]
+
+ def set_name (self, new_name):
+ pass
+
+ def set_npc (self, new_npc):
+ pass
+
+ def set_portrait (self, new_portrait):
+ pass
+
+ def __init__(self, p, n):
+ self.the_player = p
+ self.the_npc = n
+
+ self.dialogue = [self.start, self.answer2, self.answer4,
self.answer6, self.answer7, self.answer8, self.answer10, self.answer12,
self.answer14, self.answer16, self.answer17, self.answer19, self.answer20,
self.answer23, self.answer24, self.answer26, self.answer27, self.answer29,
self.answer31, self.answer33, self.answer34, self.answer35, None]
+
+ def clear (self):
+ del self.dialogue
+
+ def __getattr__ (self, name):
+ return 0
+
+ def run (self, answer):
+ self.npc = []
+ self.player = []
+ self.cont = []
+ self.dialogue[answer]()
+
+ def start (self):
+ if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 0:
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (0)
+ self.cont.append (-1)
+ self.player.append (1)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") > 0:
+
+ self.player.append (2)
+ self.cont.append (1)
+ self.player.append (-1)
+ elif adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (21)
+ self.cont.append (-1)
+ self.player.append (22)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("have_gem") == 1:
+
+ self.player.append (4)
+ self.cont.append (2)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 2 == 2:
+
+ self.player.append (12)
+ self.cont.append (7)
+ self.player.append (-1)
+ elif adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 2:
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (23)
+ self.cont.append (13)
+ self.player.append (-1)
+
+ def answer23 (self):
+ self.set_npc ("Erek Stonebreaker")
+ self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
+ self.npc.append (24)
+ self.cont.append (14)
+ self.player.append (-1)
+
+ def answer24 (self):
+ self.set_npc (self.the_npc.get_name())
+ self.color = self.the_npc.get_color()
+ self.npc.append (25)
+ self.cont.append (-1)
+ self.player.append (26)
+ self.cont.append (15)
+ self.player.append (29)
+ self.cont.append (17)
+ self.player.append (-1)
+
+ def answer29 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (30)
+ self.cont.append (-1)
+ self.player.append (31)
+ self.cont.append (18)
+ self.player.append (33)
+ self.cont.append (19)
+ self.player.append (-1)
+
+ def answer33 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (34)
+ self.cont.append (20)
+ self.player.append (-1)
+
+ def answer34 (self):
+ self.set_npc ("Erek Stonebreaker")
+ self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
+ self.npc.append (35)
+ self.cont.append (21)
+ self.player.append (-1)
+
+ def answer35 (self):
+ self.set_npc (self.the_npc.get_name())
+ self.color = self.the_npc.get_color()
+ self.npc.append (36)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer31 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (32)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer26 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (27)
+ self.cont.append (16)
+ self.player.append (-1)
+
+ def answer27 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (28)
+ self.cont.append (-1)
+ self.player.append (31)
+ self.cont.append (18)
+ self.player.append (33)
+ self.cont.append (19)
+ self.player.append (-1)
+
+ def answer12 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (13)
+ self.cont.append (-1)
+ self.player.append (14)
+ self.cont.append (8)
+ self.player.append (17)
+ self.cont.append (10)
+ self.player.append (-1)
+
+ def answer17 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (18)
+ self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 1)
+
+ self.player.append (-1)
+
+ def answer14 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (15)
+ self.cont.append (-1)
+ self.player.append (16)
+ self.cont.append (9)
+ self.player.append (19)
+ self.cont.append (11)
+ self.player.append (-1)
+
+ def answer19 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (20)
+ self.cont.append (12)
+ self.player.append (-1)
+
+ def answer20 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (9)
+ self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 1)
+
+ self.player.append (-1)
+
+ def answer16 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (7)
+ self.cont.append (4)
+ self.player.append (-1)
+
+ def answer7 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (8)
+ self.cont.append (5)
+ self.player.append (-1)
+
+ def answer8 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (9)
+ self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 1)
+
+ self.player.append (-1)
+
+ def answer4 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (5)
+ self.cont.append (-1)
+ self.player.append (6)
+ self.cont.append (3)
+ self.player.append (19)
+ self.cont.append (11)
+ self.player.append (-1)
+
+ def answer6 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (7)
+ self.cont.append (4)
+ self.player.append (-1)
+
+ def answer22 (self):
+ pass
+
+ def answer2 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (3)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 2 == 2:
+
+ self.player.append (12)
+ self.cont.append (7)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 1 == 1:
+
+ self.player.append (10)
+ self.cont.append (6)
+ if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
+
+ self.player.append (4)
+ self.cont.append (2)
+ self.player.append (-1)
+
+ def answer10 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (11)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer1 (self):
+ pass
diff --git a/scripts/dialogues/jelom_start.py b/scripts/dialogues/jelom_start.py
index 27db5a7..ed5da5e 100644
--- a/scripts/dialogues/jelom_start.py
+++ b/scripts/dialogues/jelom_start.py
@@ -238,6 +238,7 @@ class jelom_start:
self.npc.append (48)
self.cont.append (-1)
adonthell.gamedata_get_quest("demo").set_val ("silverhair_free"
, 1)
+ self.the_npc.set_dialogue ("dialogues/jelom_2nd")
self.player.append (-1)
@@ -373,4 +374,6 @@ class jelom_start:
self.cont.append (-1)
self.player.append (10)
self.cont.append (5)
+ self.player.append (31)
+ self.cont.append (17)
self.player.append (-1)
- [adonthell-wastesedge-commits] Release_0-3-1 d6345fa 228/237: REMOVED audio schedule for the extro, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 d6345fa 228/237: REMOVED audio schedule for the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bf5e61e 123/237: Took care of the case when the player takes Erek to Jelom and has not made it into Bjarn's room yet, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 1b6640a 151/237: MOVED engine control into seperate script, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7ff9ee3 116/237: FIXED a few spelling errors, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 89d9191 037/237: Added Talan Wendth, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 31f9068 122/237: Schedule to get everybody down the cellar, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ed1c142 160/237: FIXED Makefile.am's, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 6087908 137/237: ADDED Bjarn's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 69c9103 210/237: Fixed the extro a bit, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 79418df 227/237: ADDED Enter as alternative 'Action' key, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4f1725f 119/237: FIXED erek and jelom,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 8fdfd66 165/237: Added Barn interior, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 48053be 090/237: Updated the init script, so you can skip the title sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 547a59d 130/237: FIXED the mess I made ; P, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b1a1e7a 154/237: ADDED extro dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c31d284 145/237: MOVED fading code to mapengine, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 78eb33a 147/237: UPDATED scripts to make use of the new win_manager features, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 22057de 206/237: ADDED new music, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fb80ca7 128/237: Corrected a problem with the name., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8054ed1 175/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 39a6545 170/237: Fixed gate and added Kitchen's furnitures, Kai Sterker, 2016/07/25