[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 161f58d 071/237: Improved t
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 161f58d 071/237: Improved the dialogues according to the points discussed in Bavinchove |
|
Date: |
Mon, 25 Jul 2016 18:14:58 +0000 (UTC) |
tag: Release_0-3-1
commit 161f58d55ce4788bcb5c99a00b3a82e690a69051
Author: adondev <adondev>
Commit: adondev <adondev>
Improved the dialogues according to the points discussed in Bavinchove
---
scripts/dialogues/erek_start.py | 6 +-
scripts/dialogues/orloth_start.py | 2 +-
scripts/dialogues/talan_start.py | 359 +++++++++++++++++++++++--------------
3 files changed, 233 insertions(+), 134 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index a75abc4..f2e205c 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -12,7 +12,7 @@ class erek_start:
pass
def __init__(self):
- 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.answe [...]
+ 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.answe [...]
def clear (self):
del self.dialogue
@@ -240,6 +240,8 @@ class erek_start:
self.color = characters["Imoen Silverhair"].get_color()
self.npc.append (26)
self.cont.append (17)
+ quests["demo"].set_val ("know_low_quality" , 1)
+
self.player.append (-1)
def answer26 (self):
@@ -538,7 +540,7 @@ class erek_start:
self.cont.append (60)
self.player.append (-1)
- def answer204 (self):
+ def answer99 (self):
self.color = the_npc.get_color()
self.npc.append (21)
self.cont.append (-1)
diff --git a/scripts/dialogues/orloth_start.py
b/scripts/dialogues/orloth_start.py
index 336f5d9..564c551 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
diff --git a/scripts/dialogues/talan_start.py b/scripts/dialogues/talan_start.py
index f85b8d9..f638605 100755
--- a/scripts/dialogues/talan_start.py
+++ b/scripts/dialogues/talan_start.py
@@ -1,6 +1,6 @@
class talan_start:
loop = []
- strings = ["Oh, hullo again, $name.", "Listen, I really am sorry about
that fuss at the gate. I hope you will not hold it against me.", "Please, my
good man, do not mention it again. I assure you that I hold no grudge against
you. Now, if we may go on to the business at hand?", "Oh... that. Yes, how may
I help you?", "Hello, Talan. Look, I have a couple questions about the theft.",
"Well, can you tell me what happened on the night of the theft?", "Sure, but
there is not much to tell. [...]
+ strings = ["Oh, hullo again, $name.", "Listen, I really am sorry about
that fuss at the gate. I hope you will not hold it against me.", "Please, my
good man, do not mention it again. I assure you that I hold no grudge against
you. Now, if we may go on to the business at hand?", "Oh... that. Yes, how may
I help you?", "Hello, Talan. Look, I have a couple questions about the theft.",
"Well, can you tell me what happened on the night of the theft?", "In the
morning, of course, I heard t [...]
def set_name (self, new_name):
pass
@@ -12,7 +12,7 @@ class talan_start:
pass
def __init__(self):
- self.dialogue = [self.start, self.answer2, self.answer4, self.answer5,
self.answer7, self.answer8, self.answer11, self.answer12, self.answer14,
self.answer16, self.answer18, self.answer20, self.answer22, self.answer24,
self.answer26, self.answer28, self.answer30, self.answer32, self.answer33,
self.answer35, self.answer37, self.answer39, self.answer40, self.answer42,
self.answer44, self.answer45, self.answer48, self.answer53, self.answer57,
self.answer59, self.answer61, self.answe [...]
+ self.dialogue = [self.start, self.answer2, self.answer4, self.answer5,
self.answer7, self.answer8, self.answer11, self.answer12, self.answer14,
self.answer16, self.answer19, self.answer21, self.answer24, self.answer26,
self.answer28, self.answer29, self.answer30, self.answer32, self.answer33,
self.answer36, self.answer37, self.answer40, self.answer45, self.answer50,
self.answer51, self.answer52, self.answer55, self.answer56, self.answer57,
self.answer58, self.answer59, self.answe [...]
def clear (self):
del self.dialogue
@@ -42,11 +42,11 @@ class talan_start:
self.color = the_npc.get_color()
self.npc.append (0)
self.cont.append (-1)
- if quests["demo"].get_val( "know_talan_singing" ) == 1:
+ if quests["demo"].get_val ("know_talan_singing") == 1 and
the_npc.get_val ("heard_nothing") == 1:
self.player.append (14)
self.cont.append (8)
- if quests["demo"].get_val( "know_talan_singing" ) != 1:
+ else:
self.player.append (4)
self.cont.append (2)
@@ -54,70 +54,71 @@ class talan_start:
else:
self.color = the_npc.get_color()
- self.npc.append (52)
+ self.npc.append (44)
self.cont.append (-1)
- self.player.append (53)
- self.cont.append (27)
+ self.player.append (45)
+ self.cont.append (22)
self.player.append (-1)
- def answer53 (self):
+ def answer45 (self):
if quests["demo"].get_val( "told_on_talan" ) != 1:
self.color = the_npc.get_color()
- self.npc.append (54)
+ self.npc.append (46)
self.cont.append (-1)
- self.player.append (57)
- self.cont.append (28)
+ self.player.append (49)
+ self.cont.append (-1)
+ self.player.append (62)
+ self.cont.append (32)
self.player.append (-1)
else:
self.color = the_npc.get_color()
- self.npc.append (55)
+ self.npc.append (47)
self.cont.append (-1)
- self.player.append (56)
+ self.player.append (48)
self.cont.append (-1)
self.player.append (-1)
- def answer56 (self):
+ def answer48 (self):
pass
- def answer57 (self):
+ def answer62 (self):
self.color = the_npc.get_color()
- self.npc.append (58)
- self.cont.append (-1)
- self.player.append (59)
- self.cont.append (29)
+ self.npc.append (63)
+ self.cont.append (33)
self.player.append (-1)
- def answer59 (self):
+ def answer63 (self):
self.color = the_npc.get_color()
- self.npc.append (60)
- self.cont.append (-1)
- self.player.append (61)
- self.cont.append (30)
+ self.npc.append (50)
+ self.cont.append (23)
self.player.append (-1)
- def answer61 (self):
+ def answer50 (self):
self.color = the_npc.get_color()
- self.npc.append (62)
- self.cont.append (31)
+ self.npc.append (51)
+ self.cont.append (24)
self.player.append (-1)
- def answer62 (self):
+ def answer51 (self):
self.color = the_npc.get_color()
- self.npc.append (63)
- self.cont.append (32)
+ self.npc.append (52)
+ self.cont.append (25)
self.player.append (-1)
- def answer63 (self):
+ def answer52 (self):
self.color = the_npc.get_color()
- self.npc.append (64)
+ self.npc.append (53)
self.cont.append (-1)
- self.player.append (65)
+ self.player.append (54)
self.cont.append (-1)
self.player.append (-1)
- def answer65 (self):
+ def answer54 (self):
+ pass
+
+ def answer49 (self):
pass
def answer4 (self):
@@ -126,7 +127,7 @@ class talan_start:
self.cont.append (-1)
self.player.append (5)
self.cont.append (3)
- if quests["demo"].get_val( "know_alek_eavesdrop" ) == 1:
+ if quests["demo"].get_val ("know_alek_eavesdrop") == 1:
self.player.append (11)
self.cont.append (6)
@@ -153,225 +154,321 @@ class talan_start:
def answer5 (self):
self.color = the_npc.get_color()
+ self.npc.append (73)
+ self.cont.append (39)
+ self.player.append (-1)
+
+ def answer158 (self):
+ self.color = the_npc.get_color()
self.npc.append (6)
self.cont.append (-1)
self.player.append (7)
self.cont.append (4)
- self.player.append (28)
- self.cont.append (15)
+ self.player.append (24)
+ self.cont.append (12)
self.player.append (-1)
- def answer28 (self):
+ def answer24 (self):
self.color = the_npc.get_color()
- self.npc.append (29)
+ self.npc.append (25)
self.cont.append (-1)
- self.player.append (30)
- self.cont.append (16)
+ self.player.append (59)
+ self.cont.append (30)
+ if quests["demo"].get_val ("know_low_quality") == 1:
+
+ self.player.append (26)
+ self.cont.append (13)
self.player.append (-1)
- def answer30 (self):
+ def answer26 (self):
self.color = the_npc.get_color()
- self.npc.append (31)
+ self.npc.append (27)
self.cont.append (-1)
- if quests["demo"].get_val( "know_jelom" ) != 2:
+ if quests["demo"].get_val ("know_jelom") != 2:
- self.player.append (33)
- self.cont.append (18)
+ self.player.append (29)
+ self.cont.append (15)
else:
- self.player.append (32)
- self.cont.append (17)
+ self.player.append (28)
+ self.cont.append (14)
self.player.append (-1)
- def answer32 (self):
+ def answer28 (self):
self.color = the_npc.get_color()
- self.npc.append (36)
+ self.npc.append (31)
self.cont.append (-1)
- self.player.append (37)
- self.cont.append (20)
+ self.player.append (32)
+ self.cont.append (17)
self.player.append (-1)
- def answer37 (self):
+ def answer32 (self):
self.color = the_npc.get_color()
- self.npc.append (38)
+ self.npc.append (34)
self.cont.append (-1)
- if quests["demo"].get_val( "know_bjarns_insult" ) == 1:
-
- self.player.append (40)
- self.cont.append (22)
- if quests["demo"].get_val( "know_bjarns_insult" ) != 1:
+ self.player.append (56)
+ self.cont.append (27)
+ if quests["demo"].get_val ("know_bjarns_insult") == 1:
- self.player.append (39)
- self.cont.append (21)
- self.player.append (-1)
-
- def answer39 (self):
- self.color = the_npc.get_color()
- self.npc.append (41)
- self.cont.append (-1)
- self.player.append (42)
- self.cont.append (23)
+ self.player.append (33)
+ self.cont.append (18)
self.player.append (-1)
- def answer42 (self):
+ def answer33 (self):
self.color = the_npc.get_color()
- self.npc.append (43)
+ self.npc.append (35)
self.cont.append (-1)
- self.player.append (44)
- self.cont.append (24)
+ self.player.append (58)
+ self.cont.append (29)
+ self.player.append (36)
+ self.cont.append (19)
self.player.append (-1)
- def answer44 (self):
+ def answer36 (self):
self.color = the_npc.get_color()
- self.npc.append (45)
- self.cont.append (25)
+ self.npc.append (57)
+ self.cont.append (28)
self.player.append (-1)
- def answer45 (self):
+ def answer57 (self):
if quests["demo"].get_val( "know_jelom" ) != 2:
self.color = the_npc.get_color()
- self.npc.append (46)
+ self.npc.append (38)
+ self.cont.append (-1)
+ self.player.append (40)
+ self.cont.append (21)
+ self.player.append (43)
self.cont.append (-1)
- self.player.append (48)
- self.cont.append (26)
self.player.append (-1)
else:
self.color = the_npc.get_color()
- self.npc.append (47)
+ self.npc.append (39)
self.cont.append (-1)
- self.player.append (49)
+ self.player.append (41)
self.cont.append (-1)
self.player.append (-1)
- def answer49 (self):
+ def answer41 (self):
pass
- def answer48 (self):
+ def answer43 (self):
+ pass
+
+ def answer40 (self):
self.color = the_npc.get_color()
- self.npc.append (50)
+ self.npc.append (42)
self.cont.append (-1)
- self.player.append (51)
+ self.player.append (43)
self.cont.append (-1)
self.player.append (-1)
- def answer51 (self):
- pass
+ def answer58 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (37)
+ self.cont.append (20)
+ self.player.append (-1)
- def answer40 (self):
+ def answer37 (self):
+ if quests["demo"].get_val( "know_jelom" ) != 2:
+
+ self.color = the_npc.get_color()
+ self.npc.append (38)
+ self.cont.append (-1)
+ self.player.append (40)
+ self.cont.append (21)
+ self.player.append (43)
+ self.cont.append (-1)
+ self.player.append (-1)
+ else:
+
+ self.color = the_npc.get_color()
+ self.npc.append (39)
+ self.cont.append (-1)
+ self.player.append (41)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer56 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (37)
+ self.cont.append (20)
+ self.player.append (-1)
+
+ def answer29 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (30)
+ self.cont.append (16)
+ quests["demo"].set_val ("know_jelom" , 1)
+
+ self.player.append (-1)
+
+ def answer30 (self):
self.color = the_npc.get_color()
- self.npc.append (43)
+ self.npc.append (31)
self.cont.append (-1)
- self.player.append (44)
- self.cont.append (24)
+ self.player.append (32)
+ self.cont.append (17)
self.player.append (-1)
- def answer33 (self):
+ def answer59 (self):
self.color = the_npc.get_color()
- self.npc.append (34)
+ self.npc.append (60)
self.cont.append (-1)
- quests["demo"].set_val( "know_jelom", 1 );
+ if quests["demo"].get_val ("know_jelom") != 2:
+
- self.player.append (35)
- self.cont.append (19)
+ self.player.append (29)
+ self.cont.append (15)
+ else:
+
+ self.player.append (61)
+ self.cont.append (31)
self.player.append (-1)
- def answer35 (self):
+ def answer61 (self):
self.color = the_npc.get_color()
- self.npc.append (36)
+ self.npc.append (31)
self.cont.append (-1)
- self.player.append (37)
- self.cont.append (20)
+ self.player.append (32)
+ self.cont.append (17)
self.player.append (-1)
def answer7 (self):
self.color = the_npc.get_color()
self.npc.append (8)
self.cont.append (5)
+ the_npc.set_val ("heard_nothing" , 1)
+
self.player.append (-1)
def answer8 (self):
self.color = the_npc.get_color()
self.npc.append (9)
self.cont.append (-1)
- self.player.append (28)
- self.cont.append (15)
self.player.append (10)
self.cont.append (-1)
- if quests["demo"].get_val ("know_talan_singing") == 1:
+ self.player.append (24)
+ self.cont.append (12)
+ if quests["demo"].get_val ("know_olivers_noise") == 1:
- self.player.append (66)
- self.cont.append (33)
- if quests["demo"].get_val( "know_alek_eavesdrop" ) == 1:
+ self.player.append (68)
+ self.cont.append (37)
+ if quests["demo"].get_val ("know_talan_singing") == 1 and
quests["demo"].get_val ("know_olivers_noise") != 1:
+
+ self.player.append (55)
+ self.cont.append (26)
+ if quests["demo"].get_val ("know_alek_eavesdrop") == 1:
self.player.append (11)
self.cont.append (6)
self.player.append (-1)
- def answer137 (self):
+ def answer55 (self):
self.color = the_npc.get_color()
self.npc.append (15)
self.cont.append (-1)
self.player.append (16)
self.cont.append (9)
+ self.player.append (64)
+ self.cont.append (34)
self.player.append (-1)
- def answer16 (self):
+ def answer64 (self):
self.color = the_npc.get_color()
- self.npc.append (17)
+ self.npc.append (66)
self.cont.append (-1)
- self.player.append (18)
+ self.player.append (67)
+ self.cont.append (36)
+ if quests["demo"].get_val ("know_olivers_noise") == 1:
+
+ self.player.append (68)
+ self.cont.append (37)
+ self.player.append (-1)
+
+ def answer67 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (18)
+ self.cont.append (-1)
+ self.player.append (19)
self.cont.append (10)
self.player.append (-1)
- def answer18 (self):
+ def answer19 (self):
self.color = the_npc.get_color()
- self.npc.append (19)
+ self.npc.append (20)
self.cont.append (-1)
- self.player.append (20)
- self.cont.append (11)
+ self.player.append (71)
+ self.cont.append (38)
self.player.append (-1)
- def answer20 (self):
+ def answer71 (self):
self.color = the_npc.get_color()
- self.npc.append (21)
+ self.npc.append (72)
self.cont.append (-1)
- self.player.append (22)
- self.cont.append (12)
+ quests["demo"].set_val ("know_talan_singing" , 2)
+
self.player.append (-1)
- def answer22 (self):
+ def answer16 (self):
self.color = the_npc.get_color()
- self.npc.append (23)
+ self.npc.append (17)
self.cont.append (-1)
- self.player.append (24)
- self.cont.append (13)
+ self.player.append (65)
+ self.cont.append (35)
+ self.player.append (64)
+ self.cont.append (34)
self.player.append (-1)
- def answer24 (self):
+ def answer65 (self):
self.color = the_npc.get_color()
- self.npc.append (25)
+ self.npc.append (18)
self.cont.append (-1)
- self.player.append (26)
- self.cont.append (14)
+ self.player.append (19)
+ self.cont.append (10)
self.player.append (-1)
- def answer26 (self):
+ def answer68 (self):
self.color = the_npc.get_color()
- self.npc.append (27)
+ self.npc.append (69)
self.cont.append (-1)
- quests["demo"].set_val ("know_talan_singing" , 2)
+ if quests["demo"].get_val ("know_talan_singing") == 1:
+
+ self.player.append (21)
+ self.cont.append (11)
+ else:
+
+ self.player.append (70)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer70 (self):
+ pass
+ def answer21 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (22)
+ self.cont.append (-1)
+ self.player.append (23)
+ self.cont.append (-1)
self.player.append (-1)
+ def answer23 (self):
+ quests["demo"].set_val ("know_talan_singing" , 2)
+
+
+ pass
+
def answer14 (self):
self.color = the_npc.get_color()
self.npc.append (15)
self.cont.append (-1)
self.player.append (16)
self.cont.append (9)
+ self.player.append (64)
+ self.cont.append (34)
self.player.append (-1)
def answer2 (self):
@@ -380,7 +477,7 @@ class talan_start:
self.cont.append (-1)
self.player.append (5)
self.cont.append (3)
- if quests["demo"].get_val( "know_alek_eavesdrop" ) == 1:
+ if quests["demo"].get_val ("know_alek_eavesdrop") == 1:
self.player.append (11)
self.cont.append (6)
- [adonthell-wastesedge-commits] Release_0-3-1 8461ce1 108/237: FIXED a bug in Orloth's dialogue, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 8461ce1 108/237: FIXED a bug in Orloth's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9da31d1 085/237: OOpps!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2b67b8c 096/237: Reorganized the schedules structure, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 11972d6 094/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cfd3652 065/237: Adapted schedules and init scripts to the theme and font manager., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b03aa9 081/237: Done some map work., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a49adb1 102/237: Now getting the_player, characters and quests via the proper API functions, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 53eb6ab 113/237: The player is now saved in character.data too, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ef12728 074/237: Added transition tiles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cf1b9c2 093/237: Adapted the game to the new Python engine, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 161f58d 071/237: Improved the dialogues according to the points discussed in Bavinchove,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 13286b8 110/237: UPDATED scripts after removal of map_engine, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 984f397 125/237: Test add, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0206066 097/237: CHANGED Jeloms dialogue to fit with the new plot, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a0e6b2a 045/237: Oops! I kept my test files!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 37d1b1d 089/237: Fixed the mess I made yesterday. Sorry., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3ad0ff2 043/237: Some bugfixes and little updates, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d13c53f 052/237: Speed improvements, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 be10dec 068/237: Added guards house interior., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9d5c3db 072/237: Continued furniturizing, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a51967 079/237: Continued map., Kai Sterker, 2016/07/25