[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 d190e60 164/237: FIXED the
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 d190e60 164/237: FIXED the mess I made with my last update :( |
|
Date: |
Mon, 25 Jul 2016 18:15:09 +0000 (UTC) |
tag: Release_0-3-1
commit d190e60e26eafd95f9ea26e0b63b2c62d16ff2e2
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED the mess I made with my last update :(
---
scripts/dialogues/bjarn_start.py | 185 ++++++++++++++++++++++++++++++-------
scripts/dialogues/demo_intro_1.py | 166 +++++++++++++++------------------
scripts/dialogues/erek_start.py | 100 +++++++++++---------
scripts/dialogues/jelom_2nd.py | 84 +++++++++++------
4 files changed, 337 insertions(+), 198 deletions(-)
diff --git a/scripts/dialogues/bjarn_start.py b/scripts/dialogues/bjarn_start.py
index 54a014f..d85ff21 100755
--- a/scripts/dialogues/bjarn_start.py
+++ b/scripts/dialogues/bjarn_start.py
@@ -2,7 +2,7 @@ import adonthell
class bjarn_start:
loop = []
- strings = ["You try the door, but find it locked. From within the room
you hear a deep voice.", "At the door to their room, Erek produces a key and
unlocks it.", "Maybe I should not be doing this, but I do want my master to get
his stones back.", "I do not wish to be disturbed right now, so please go away!
First I am burglared, and now I can get no peace with all the busybodies
running around, making my tragedy their business!", "Erek, who is this, and why
have you let him in?", "This i [...]
+ strings = ["You try the door, but find it locked. From within the room
you hear a deep voice.", "At the door to their room, Erek produces a key and
unlocks it.", "Maybe I should not be doing this, but I do want my master to get
his stones back.", "I do not wish to be disturbed right now, so please go away!
First I am burgled, and now I can get no peace with all the busybodies running
around, making my tragedy their business!", "Erek, who is this, and why have
you let him in?", "This is [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class bjarn_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer0, self.answer1,
self.answer2, self.answer4, self.answer6, self.answer8, self.answer10,
self.answer12, self.answer14, self.answer15, self.answer16, self.answer18,
self.answer20, self.answer23, self.answer25, self.answer27, self.answer29, None]
+ self.dialogue = [self.start, self.answer0, self.answer1,
self.answer2, self.answer4, self.answer6, self.answer8, self.answer10,
self.answer11, self.answer12, self.answer14, self.answer15, self.answer16,
self.answer18, self.answer22, self.answer23, self.answer25, self.answer26,
self.answer29, self.answer30, self.answer33, self.answer34, self.answer35,
self.answer37, self.answer39, self.answer40, self.answer42, self.answer43,
self.answer46, self.answer47, self.answer50, None]
def clear (self):
del self.dialogue
@@ -36,7 +36,7 @@ class bjarn_start:
self.color = 0
self.npc.append (12)
- self.cont.append (8)
+ self.cont.append (9)
self.player.append (-1)
if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 2:
@@ -69,7 +69,7 @@ class bjarn_start:
self.player.append (-1)
def answer2 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (4)
self.cont.append (4)
@@ -85,7 +85,7 @@ class bjarn_start:
self.player.append (-1)
def answer6 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (7)
self.cont.append (-1)
@@ -107,6 +107,12 @@ class bjarn_start:
def answer10 (self):
self.color = self.the_npc.get_color()
self.npc.append (11)
+ self.cont.append (8)
+ self.player.append (-1)
+
+ def answer11 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (27)
self.cont.append (-1)
self.player.append (-1)
@@ -114,18 +120,22 @@ class bjarn_start:
self.color = self.the_npc.get_color()
self.npc.append (13)
self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") > 0:
+
+ self.player.append (37)
+ self.cont.append (23)
if adonthell.gamedata_get_quest("demo").get_val
("know_alek_eavesdrop") == 1:
self.player.append (16)
- self.cont.append (11)
+ self.cont.append (12)
if adonthell.gamedata_get_quest("demo").get_val
("know_bjarns_insult") == 1:
self.player.append (15)
- self.cont.append (10)
- if adonthell.gamedata_get_quest("demo").get_val
("ask_packed_gems") == 1:
+ self.cont.append (11)
+ if adonthell.gamedata_get_quest("demo").get_val
("ask_packed_gems") == 1 or adonthell.gamedata_get_quest("demo").get_val
("ask_packed_gems") == 2:
self.player.append (14)
- self.cont.append (9)
+ self.cont.append (10)
self.player.append (-1)
def answer14 (self):
@@ -133,65 +143,178 @@ class bjarn_start:
self.npc.append (17)
self.cont.append (-1)
self.player.append (18)
- self.cont.append (12)
+ self.cont.append (13)
+ self.player.append (32)
+ self.cont.append (-1)
self.player.append (-1)
+ def answer32 (self):
+ pass
+
def answer18 (self):
self.color = self.the_npc.get_color()
self.npc.append (19)
self.cont.append (-1)
- self.player.append (20)
- self.cont.append (13)
+ if adonthell.gamedata_get_quest("demo").get_val
("ask_packed_gems") == 2:
+
+ self.player.append (33)
+ self.cont.append (20)
self.player.append (-1)
- def answer20 (self):
+ def answer33 (self):
self.color = self.the_npc.get_color()
- self.npc.append (24)
+ self.npc.append (34)
+ self.cont.append (21)
+ self.player.append (-1)
+
+ def answer34 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (35)
+ self.cont.append (22)
+ self.player.append (-1)
+
+ def answer35 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (36)
self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("ask_packed_gems"
, 3)
+
+ self.player.append (-1)
+
+ def answer15 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (20)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer16 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (21)
+ self.cont.append (-1)
+ self.player.append (22)
+ self.cont.append (14)
self.player.append (25)
- self.cont.append (15)
+ self.cont.append (16)
self.player.append (-1)
def answer25 (self):
self.color = self.the_npc.get_color()
self.npc.append (26)
- self.cont.append (-1)
- self.player.append (27)
- self.cont.append (16)
+ self.cont.append (17)
self.player.append (-1)
- def answer27 (self):
+ def answer26 (self):
self.color = self.the_npc.get_color()
self.npc.append (28)
self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer22 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (23)
+ self.cont.append (15)
+ self.player.append (-1)
+
+ def answer23 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (24)
+ self.cont.append (-1)
self.player.append (29)
- self.cont.append (17)
+ self.cont.append (18)
+ self.player.append (30)
+ self.cont.append (19)
+ self.player.append (-1)
+
+ def answer30 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (31)
+ self.cont.append (-1)
self.player.append (-1)
def answer29 (self):
self.color = self.the_npc.get_color()
- self.npc.append (30)
+ self.npc.append (26)
+ self.cont.append (17)
+ self.player.append (-1)
+
+ def answer37 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (38)
self.cont.append (-1)
+ self.player.append (39)
+ self.cont.append (24)
+ self.player.append (40)
+ self.cont.append (25)
self.player.append (-1)
- def answer15 (self):
+ def answer40 (self):
self.color = self.the_npc.get_color()
- self.npc.append (21)
+ self.npc.append (41)
self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 1 == 1:
+
+ self.player.append (43)
+ self.cont.append (27)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 2 == 2:
+
+ self.player.append (42)
+ self.cont.append (26)
self.player.append (-1)
- def answer16 (self):
+ def answer42 (self):
self.color = self.the_npc.get_color()
- self.npc.append (22)
+ self.npc.append (44)
self.cont.append (-1)
- self.player.append (23)
- self.cont.append (14)
+ self.player.append (46)
+ self.cont.append (28)
+ self.player.append (47)
+ self.cont.append (29)
self.player.append (-1)
- def answer23 (self):
+ def answer47 (self):
self.color = self.the_npc.get_color()
- self.npc.append (24)
+ self.npc.append (48)
self.cont.append (-1)
- self.player.append (25)
- self.cont.append (15)
+ adonthell.gamedata_get_quest("demo").set_val ("bjarn_lies" , 1)
+
+ self.player.append (-1)
+
+ def answer46 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (48)
+ self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("bjarn_lies" , 1)
+
+ self.player.append (-1)
+
+ def answer43 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (45)
+ self.cont.append (-1)
+ self.player.append (46)
+ self.cont.append (28)
+ self.player.append (47)
+ self.cont.append (29)
+ self.player.append (-1)
+
+ def answer39 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (49)
+ self.cont.append (-1)
+ self.player.append (50)
+ self.cont.append (30)
+ self.player.append (-1)
+
+ def answer50 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (41)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 1 == 1:
+
+ self.player.append (43)
+ self.cont.append (27)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 2 == 2:
+
+ self.player.append (42)
+ self.cont.append (26)
self.player.append (-1)
diff --git a/scripts/dialogues/demo_intro_1.py
b/scripts/dialogues/demo_intro_1.py
index 5df6960..16357e9 100644
--- a/scripts/dialogues/demo_intro_1.py
+++ b/scripts/dialogues/demo_intro_1.py
@@ -2,7 +2,7 @@ import adonthell
class demo_intro_1:
loop = []
- strings = ["Your employer, eh? Who might that be?", "The Lady
Silverhair, and she must have great need of me, so let me pass!", "Nay, if you
are Silverhair's man, then I shall not let you pass. That one is the source of
all this mess, and I'll be switched if I let her accomplice in to free her. Be
on your way!", "What sort of mess, man? If my Lady is in trouble, I must
know!", "I do not know what nonsense you think is going on here. But if my Lady
needs me, then I shall come to her aid! [...]
+ strings = ["Your employer, eh? Who might that be?", "The Lady
Silverhair, and she must have great need of me, so let me pass!", "Nay, if you
are Silverhair's man, then I shall not let you pass. That one is the source of
all this mess, and I'll be switched if I let her accomplice in to free her. Be
on your way!", "What sort of mess, man? If my Lady is in trouble, I must
know!", "Don't be foolish! I must see my Lady at once. Open this gate!", "The
sort of trouble we have no wish to put up [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class demo_intro_1:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer5, self.answer7, self.answer8, self.answer9,
self.answer10, self.answer12, self.answer13, self.answer15, self.answer18,
self.answer22, self.answer23, self.answer24, self.answer27, self.answer28,
self.answer30, None]
+ self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer6, self.answer7, self.answer8, self.answer9,
self.answer11, self.answer12, self.answer14, self.answer17, self.answer21,
self.answer22, self.answer23, self.answer26, self.answer27, self.answer29, None]
def clear (self):
del self.dialogue
@@ -41,164 +41,150 @@ class demo_intro_1:
self.cont.append (-1)
self.player.append (1)
self.cont.append (1)
- self.player.append (10)
- self.cont.append (8)
+ self.player.append (9)
+ self.cont.append (7)
self.player.append (-1)
- def answer10 (self):
+ def answer9 (self):
self.color = self.the_npc.get_color()
- self.npc.append (11)
+ self.npc.append (10)
self.cont.append (-1)
+ self.player.append (11)
+ self.cont.append (8)
self.player.append (12)
self.cont.append (9)
- self.player.append (13)
- self.cont.append (10)
self.player.append (-1)
- def answer13 (self):
+ def answer12 (self):
self.color = self.the_npc.get_color()
- self.npc.append (14)
+ self.npc.append (13)
self.cont.append (-1)
- self.player.append (15)
- self.cont.append (11)
- self.player.append (-1)
-
- def answer15 (self):
- self.color = self.the_npc.get_color()
- self.npc.append (16)
- self.cont.append (-1)
- self.player.append (4)
- self.cont.append (3)
- self.player.append (3)
- self.cont.append (2)
+ self.player.append (14)
+ self.cont.append (10)
self.player.append (-1)
- def answer3 (self):
+ def answer14 (self):
self.color = self.the_npc.get_color()
- self.npc.append (6)
+ self.npc.append (15)
self.cont.append (-1)
self.player.append (7)
self.cont.append (5)
- self.player.append (8)
- self.cont.append (6)
+ self.player.append (6)
+ self.cont.append (4)
self.player.append (-1)
- def answer8 (self):
+ def answer6 (self):
self.color = self.the_npc.get_color()
- self.npc.append (19)
+ self.npc.append (16)
self.cont.append (-1)
- self.player.append (18)
- self.cont.append (12)
+ self.player.append (17)
+ self.cont.append (11)
self.player.append (-1)
- def answer18 (self):
+ def answer17 (self):
self.color = self.the_npc.get_color()
- self.npc.append (20)
+ self.npc.append (19)
self.cont.append (-1)
- self.player.append (9)
- self.cont.append (7)
+ self.player.append (8)
+ self.cont.append (6)
self.player.append (-1)
- def answer9 (self):
+ def answer8 (self):
self.color = self.the_npc.get_color()
- self.npc.append (26)
+ self.npc.append (25)
self.cont.append (-1)
+ self.player.append (26)
+ self.cont.append (15)
self.player.append (27)
self.cont.append (16)
- self.player.append (28)
- self.cont.append (17)
- self.player.append (5)
- self.cont.append (4)
+ self.player.append (4)
+ self.cont.append (3)
self.player.append (-1)
- def answer5 (self):
+ def answer4 (self):
self.color = self.the_npc.get_color()
- self.npc.append (21)
+ self.npc.append (20)
self.cont.append (-1)
- self.player.append (22)
- self.cont.append (13)
- self.player.append (24)
- self.cont.append (15)
+ self.player.append (21)
+ self.cont.append (12)
+ self.player.append (23)
+ self.cont.append (14)
self.player.append (-1)
- def answer24 (self):
+ def answer23 (self):
self.color = 0
- self.npc.append (23)
- self.cont.append (14)
+ self.npc.append (22)
+ self.cont.append (13)
self.player.append (-1)
- def answer23 (self):
+ def answer22 (self):
self.color = 0
- self.npc.append (25)
+ self.npc.append (24)
self.cont.append (-1)
self.the_npc.set_dialogue ("dialogues/talan_start")
self.player.append (-1)
- def answer22 (self):
+ def answer21 (self):
self.color = 0
- self.npc.append (23)
- self.cont.append (14)
+ self.npc.append (22)
+ self.cont.append (13)
self.player.append (-1)
- def answer28 (self):
+ def answer27 (self):
self.color = self.the_npc.get_color()
- self.npc.append (29)
+ self.npc.append (28)
self.cont.append (-1)
- self.player.append (30)
- self.cont.append (18)
- self.player.append (5)
- self.cont.append (4)
+ self.player.append (29)
+ self.cont.append (17)
+ self.player.append (4)
+ self.cont.append (3)
self.player.append (-1)
- def answer30 (self):
+ def answer29 (self):
self.color = self.the_npc.get_color()
- self.npc.append (31)
+ self.npc.append (30)
self.cont.append (-1)
- self.player.append (22)
- self.cont.append (13)
- self.player.append (24)
- self.cont.append (15)
+ self.player.append (21)
+ self.cont.append (12)
+ self.player.append (23)
+ self.cont.append (14)
self.player.append (-1)
- def answer27 (self):
+ def answer26 (self):
self.color = self.the_npc.get_color()
- self.npc.append (29)
+ self.npc.append (28)
self.cont.append (-1)
- self.player.append (30)
- self.cont.append (18)
- self.player.append (5)
- self.cont.append (4)
+ self.player.append (29)
+ self.cont.append (17)
+ self.player.append (4)
+ self.cont.append (3)
self.player.append (-1)
def answer7 (self):
self.color = self.the_npc.get_color()
- self.npc.append (17)
+ self.npc.append (18)
self.cont.append (-1)
- self.player.append (18)
- self.cont.append (12)
+ self.player.append (17)
+ self.cont.append (11)
self.player.append (-1)
- def answer4 (self):
+ def answer11 (self):
self.color = self.the_npc.get_color()
- self.npc.append (26)
+ self.npc.append (2)
self.cont.append (-1)
- self.player.append (27)
- self.cont.append (16)
- self.player.append (28)
- self.cont.append (17)
- self.player.append (5)
- self.cont.append (4)
+ self.player.append (3)
+ self.cont.append (2)
self.player.append (-1)
- def answer12 (self):
+ def answer3 (self):
self.color = self.the_npc.get_color()
- self.npc.append (2)
+ self.npc.append (5)
self.cont.append (-1)
- self.player.append (3)
- self.cont.append (2)
- self.player.append (4)
- self.cont.append (3)
+ self.player.append (6)
+ self.cont.append (4)
+ self.player.append (7)
+ self.cont.append (5)
self.player.append (-1)
def answer1 (self):
@@ -207,6 +193,4 @@ class demo_intro_1:
self.cont.append (-1)
self.player.append (3)
self.cont.append (2)
- self.player.append (4)
- self.cont.append (3)
self.player.append (-1)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index a00224e..6dc8803 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -2,7 +2,7 @@ import adonthell
class erek_start:
loop = []
- strings = ["Before you stands a young Dwarf, with an open face and no
sign of the traditional beard. His expression shows his intelligence and a
trace of humor as he watches you expectantly.", "You are Erek Stonebreaker,
aren't you?", "That I am. Erek Stonebreaker, aspirant to the trading business
and Master Fingolsons apprentice. But I seem to not remember you, $fm
{madam/sir}.", "I am $name.", "I am $name, Lady Silverhair's man. I have some
questions.", "Well met then, $name. Only I f [...]
+ strings = ["Before you stands a young Dwarf, with an open face and no
sign of the traditional beard. His expression shows his intelligence and a
trace of humour as he watches you expectantly.", "You are Erek Stonebreaker,
aren't you?", "That I am. Erek Stonebreaker, aspirant to the trading business
and Master Fingolson's apprentice. But I seem to not remember you, $fm
{madam/sir}.", "I am $name.", "I am $name, Lady Silverhair's man. I have some
questions.", "Well met then, $name. Only I [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class erek_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer7, self.answer8, self.answer11, self.answer12,
self.answer13, self.answer14, self.answer16, self.answer19, self.answer20,
self.answer22, self.answer23, self.answer24, self.answer25, self.answer26,
self.answer27, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer34, self.answer37, self.answer38, self.answer40,
self.answer41, self.answer42, self.answer43, self.answer45, s [...]
+ self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer7, self.answer8, self.answer11, self.answer12,
self.answer13, self.answer14, self.answer16, self.answer19, self.answer20,
self.answer22, self.answer23, self.answer24, self.answer25, self.answer26,
self.answer27, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer34, self.answer37, self.answer38, self.answer40,
self.answer41, self.answer42, self.answer43, self.answer45, s [...]
def clear (self):
del self.dialogue
@@ -77,7 +77,7 @@ class erek_start:
self.player.append (43)
self.cont.append (30)
self.player.append (-1)
- elif self.the_npc.get_val ("apologize") == 0:
+ elif self.the_npc.get_val ("apologise") == 0 and
self.the_npc.get_val ("work_4_shair") != 0 and
adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") > 0:
self.color = 0
self.npc.append (45)
@@ -93,8 +93,8 @@ class erek_start:
self.color = 0
self.npc.append (112)
- self.cont.append (71)
- self.the_npc.set_val ("apologize" , 0)
+ self.cont.append (72)
+ self.the_npc.set_val ("apologise" , 0)
self.player.append (-1)
@@ -103,25 +103,25 @@ class erek_start:
self.npc.append (113)
self.cont.append (-1)
self.player.append (115)
- self.cont.append (73)
+ self.cont.append (74)
self.player.append (-1)
def answer115 (self):
self.color = self.the_npc.get_color()
self.npc.append (114)
- self.cont.append (72)
+ self.cont.append (73)
self.player.append (-1)
def answer114 (self):
self.color = 0
self.npc.append (102)
- self.cont.append (65)
+ self.cont.append (66)
self.player.append (-1)
def answer102 (self):
self.color = 0
self.npc.append (103)
- self.cont.append (66)
+ self.cont.append (67)
self.player.append (-1)
def answer103 (self):
@@ -136,7 +136,7 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
self.player.append (105)
- self.cont.append (67)
+ self.cont.append (68)
self.player.append (-1)
def answer105 (self):
@@ -189,15 +189,21 @@ class erek_start:
def answer63 (self):
self.color = self.the_npc.get_color()
self.npc.append (64)
+ self.cont.append (44)
+ self.player.append (-1)
+
+ def answer64 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (120)
self.cont.append (-1)
self.player.append (65)
- self.cont.append (44)
+ self.cont.append (45)
self.player.append (-1)
def answer65 (self):
self.color = self.the_npc.get_color()
self.npc.append (66)
- self.cont.append (45)
+ self.cont.append (46)
self.player.append (-1)
def answer66 (self):
@@ -205,19 +211,19 @@ class erek_start:
self.npc.append (67)
self.cont.append (-1)
self.player.append (68)
- self.cont.append (46)
+ self.cont.append (47)
self.player.append (-1)
def answer68 (self):
self.color = self.the_npc.get_color()
self.npc.append (69)
- self.cont.append (47)
+ self.cont.append (48)
self.player.append (-1)
def answer69 (self):
self.color = self.the_npc.get_color()
self.npc.append (70)
- self.cont.append (48)
+ self.cont.append (49)
self.player.append (-1)
def answer70 (self):
@@ -273,19 +279,19 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1 and adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") >= 2:
self.player.append (116)
- self.cont.append (74)
+ self.cont.append (75)
if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
self.player.append (111)
- self.cont.append (70)
+ self.cont.append (71)
if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
self.player.append (81)
- self.cont.append (53)
+ self.cont.append (54)
if adonthell.gamedata_get_quest("demo").get_val
("ask_packed_gems") == 1:
self.player.append (91)
- self.cont.append (58)
+ self.cont.append (59)
if adonthell.gamedata_get_quest("demo").get_val
("know_bjarns_insult") == 1:
self.player.append (48)
@@ -295,13 +301,13 @@ class erek_start:
def answer48 (self):
self.color = self.the_npc.get_color()
self.npc.append (72)
- self.cont.append (49)
+ self.cont.append (50)
self.player.append (-1)
def answer72 (self):
self.color = self.the_npc.get_color()
self.npc.append (73)
- self.cont.append (50)
+ self.cont.append (51)
self.player.append (-1)
def answer73 (self):
@@ -315,7 +321,7 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
self.player.append (81)
- self.cont.append (53)
+ self.cont.append (54)
self.player.append (-1)
def answer75 (self):
@@ -326,13 +332,15 @@ class erek_start:
self.npc.append (92)
self.cont.append (-1)
self.player.append (93)
- self.cont.append (59)
+ self.cont.append (60)
self.player.append (-1)
def answer93 (self):
self.color = self.the_npc.get_color()
self.npc.append (94)
self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("ask_packed_gems"
, 2)
+
self.player.append (95)
self.cont.append (-1)
self.player.append (-1)
@@ -347,7 +355,7 @@ class erek_start:
self.player.append (84)
self.cont.append (-1)
self.player.append (85)
- self.cont.append (54)
+ self.cont.append (55)
self.player.append (-1)
def answer85 (self):
@@ -355,15 +363,15 @@ class erek_start:
self.npc.append (83)
self.cont.append (-1)
self.player.append (87)
- self.cont.append (56)
+ self.cont.append (57)
self.player.append (86)
- self.cont.append (55)
+ self.cont.append (56)
self.player.append (-1)
def answer86 (self):
self.color = self.the_npc.get_color()
self.npc.append (88)
- self.cont.append (57)
+ self.cont.append (58)
self.player.append (-1)
def answer88 (self):
@@ -381,7 +389,7 @@ class erek_start:
self.player.append (84)
self.cont.append (-1)
self.player.append (86)
- self.cont.append (55)
+ self.cont.append (56)
self.player.append (-1)
def answer84 (self):
@@ -392,21 +400,21 @@ class erek_start:
self.npc.append (98)
self.cont.append (-1)
self.player.append (99)
- self.cont.append (62)
- self.player.append (100)
self.cont.append (63)
+ self.player.append (100)
+ self.cont.append (64)
self.player.append (-1)
def answer100 (self):
self.color = self.the_npc.get_color()
self.npc.append (101)
- self.cont.append (64)
+ self.cont.append (65)
self.player.append (-1)
def answer101 (self):
self.color = 0
self.npc.append (102)
- self.cont.append (65)
+ self.cont.append (66)
self.player.append (-1)
def answer99 (self):
@@ -414,23 +422,23 @@ class erek_start:
self.npc.append (107)
self.cont.append (-1)
self.player.append (108)
- self.cont.append (68)
- self.player.append (109)
self.cont.append (69)
+ self.player.append (109)
+ self.cont.append (70)
self.player.append (-1)
def answer109 (self):
self.color = self.the_npc.get_color()
self.npc.append (110)
self.cont.append (-1)
- self.the_npc.set_val ("apologize" , 1)
+ self.the_npc.set_val ("apologise" , 1)
self.player.append (-1)
def answer108 (self):
self.color = self.the_npc.get_color()
self.npc.append (101)
- self.cont.append (64)
+ self.cont.append (65)
self.player.append (-1)
def answer116 (self):
@@ -499,7 +507,7 @@ class erek_start:
self.player.append (-1)
def answer30 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (31)
self.cont.append (-1)
@@ -521,7 +529,7 @@ class erek_start:
self.player.append (76)
self.cont.append (-1)
self.player.append (77)
- self.cont.append (51)
+ self.cont.append (52)
self.player.append (-1)
def answer77 (self):
@@ -529,7 +537,7 @@ class erek_start:
self.npc.append (78)
self.cont.append (-1)
self.player.append (79)
- self.cont.append (52)
+ self.cont.append (53)
self.player.append (-1)
def answer79 (self):
@@ -541,7 +549,7 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
self.player.append (97)
- self.cont.append (61)
+ self.cont.append (62)
self.player.append (-1)
def answer97 (self):
@@ -549,9 +557,9 @@ class erek_start:
self.npc.append (98)
self.cont.append (-1)
self.player.append (99)
- self.cont.append (62)
- self.player.append (100)
self.cont.append (63)
+ self.player.append (100)
+ self.cont.append (64)
self.player.append (-1)
def answer33 (self):
@@ -571,7 +579,7 @@ class erek_start:
self.player.append (76)
self.cont.append (-1)
self.player.append (77)
- self.cont.append (51)
+ self.cont.append (52)
self.player.append (-1)
def answer71 (self):
@@ -630,7 +638,7 @@ class erek_start:
def answer20 (self):
self.color = self.the_npc.get_color()
self.npc.append (96)
- self.cont.append (60)
+ self.cont.append (61)
self.player.append (-1)
def answer96 (self):
@@ -677,10 +685,10 @@ class erek_start:
def answer23 (self):
self.color = self.the_npc.get_color()
self.npc.append (118)
- self.cont.append (75)
+ self.cont.append (76)
self.player.append (-1)
- def answer242 (self):
+ def answer118 (self):
self.set_npc ("Imoen Silverhair")
self.color = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
self.npc.append (24)
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index 1ca7e1d..3f50c01 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -2,7 +2,7 @@ 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 [...]
+ 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
@@ -17,7 +17,7 @@ class jelom_2nd:
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]
+ 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, self.answer38, None]
def clear (self):
del self.dialogue
@@ -90,7 +90,7 @@ class jelom_2nd:
self.player.append (12)
self.cont.append (7)
self.player.append (-1)
- else:
+ elif adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 2:
self.color = self.the_npc.get_color()
self.npc.append (23)
@@ -98,6 +98,49 @@ class jelom_2nd:
adonthell.gamedata_get_quest("demo").set_val
("convince_jelom" , 3)
self.player.append (-1)
+ else:
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (37)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") < 3:
+
+ self.player.append (38)
+ self.cont.append (22)
+ if adonthell.gamedata_get_quest("demo").get_val
("bjarn_lies") == 1:
+
+ 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_id())
+ self.color = self.the_npc.get_color()
+ self.npc.append (36)
+ self.cont.append (-1)
+ # make all dudes go down to Bjarn
+ adonthell.gamedata_get_quest("demo").set_val ("the_end" , 1)
+
+ self.player.append (-1)
+
+ def answer38 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (39)
+ self.cont.append (-1)
+ self.player.append (-1)
def answer23 (self):
self.set_npc ("Erek Stonebreaker")
@@ -107,7 +150,7 @@ class jelom_2nd:
self.player.append (-1)
def answer24 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (25)
self.cont.append (-1)
@@ -123,31 +166,10 @@ class jelom_2nd:
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)
- # make all dudes go down to Bjarn
- adonthell.gamedata_get_quest("demo").set_val ("the_end" , 1)
+ if adonthell.gamedata_get_quest("demo").get_val ("bjarn_lies")
== 1:
+ self.player.append (33)
+ self.cont.append (19)
self.player.append (-1)
def answer31 (self):
@@ -168,8 +190,10 @@ class jelom_2nd:
self.cont.append (-1)
self.player.append (31)
self.cont.append (18)
- self.player.append (33)
- self.cont.append (19)
+ if adonthell.gamedata_get_quest("demo").get_val ("bjarn_lies")
== 1:
+
+ self.player.append (33)
+ self.cont.append (19)
self.player.append (-1)
def answer12 (self):
- [adonthell-wastesedge-commits] Release_0-3-1 049cceb 174/237: ADDED gem found in Silverhair's luggage, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 049cceb 174/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 01380a3 221/237: Tuned intro & extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0a4e9eb 236/237: REMOVED ^M's from end of line, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa549f8 159/237: FIXED bug in Erek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d412018 189/237: ADDED .cvsignore, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ba734bb 232/237: Fixed some in game problems, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 30df91a 158/237: FINISHED Tristan, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e22605d 178/237: Added various stuff on the map, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 140e4c2 172/237: Deactivated the 'Options' option, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4defa7b 194/237: FIXED bug, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d190e60 164/237: FIXED the mess I made with my last update :(,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 25cd3d4 153/237: Improved Eyes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bb956f2 196/237: ADDED shutdown, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a4da9a 234/237: ADDED ability to build RPM package, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7e2a6c6 157/237: FIXED some bugs, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bc3ef93 217/237: ADDED PLAYING file, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3502543 201/237: added running alek., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e74fdec 226/237: ADDED music to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dc927e9 184/237: FIXED some problems with the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8d71e77 171/237: FINISHED extro dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b1e9ee0 231/237: FORGOT to distribute one schedule, Kai Sterker, 2016/07/25