[adonthell-wastesedge-commits] Release_0-3-1 0206066 097/237: CHANGED Jeloms dialogue to fit with the new plot

[Kai Sterker]

tag: Release_0-3-1
commit 0206066a1154f0ab288b6b3f3e17d5bc75f60b75
Author: adondev <adondev>
Commit: adondev <adondev>

    CHANGED Jeloms dialogue to fit with the new plot
---
 scripts/dialogues/jelom_start.py |  276 +++++++++++++++++++++++++-------------
 1 file changed, 182 insertions(+), 94 deletions(-)

diff --git a/scripts/dialogues/jelom_start.py b/scripts/dialogues/jelom_start.py
index 9b8ba45..a1ca5fd 100644
--- a/scripts/dialogues/jelom_start.py
+++ b/scripts/dialogues/jelom_start.py
@@ -1,6 +1,6 @@
 class jelom_start:
     loop = []
-    strings = ["Halt there! No-one is allowed into the prisoner's room!", 
"Stop right there, half-elf! You know that you are not allowed in there!", 
"No-one is allowed into the prisoner's room, so please leave this hallway!", 
"You again, half-elf? What do you want this time?", "Ah, you must be Jelom. 
Talan told me that I could find you here.", "And just who are you to prevent me 
from entering, sir?", "Nice to see you again, Jelom. Look, I have some more 
questions for you.", "Look, Jelom, [...]
+    strings = ["Halt there! No-one is allowed into the prisoner's room!", 
"Stop right there, half-elf! You know that you are not allowed in there!", 
"No-one is allowed into the prisoner's room, so please leave this hallway!", 
"You again, half-elf? What do you want this time?", "Ah, you must be Jelom. 
Talan told me that I could find you here.", "And just who are you to prevent me 
from entering, sir?", "Nice to see you again, Jelom. Look, I have some more 
questions for you.", "Look, Jelom, [...]
 
     def set_name (self, new_name):
         pass
@@ -12,7 +12,7 @@ class jelom_start:
         pass
 
     def __init__(self):
-        self.dialogue = [self.start, self.answer4, self.answer5, self.answer6, 
self.answer7, self.answer10, self.answer13, self.answer15, self.answer17, 
self.answer19, self.answer21, self.answer23, self.answer24, self.answer27, 
self.answer29, self.answer31, self.answer32, self.answer34, self.answer36, 
self.answer38, self.answer40, None]
+        self.dialogue = [self.start, self.answer4, self.answer5, self.answer6, 
self.answer7, self.answer10, self.answer14, self.answer16, self.answer17, 
self.answer18, self.answer19, self.answer21, self.answer22, self.answer24, 
self.answer26, self.answer28, self.answer30, self.answer31, self.answer33, 
self.answer34, self.answer36, self.answer37, self.answer39, self.answer40, 
self.answer41, self.answer43, self.answer44, self.answer46, self.answer47, None]
 
     def clear (self):
         del self.dialogue
@@ -37,7 +37,7 @@ class jelom_start:
             self.color = the_npc.get_color()
             self.npc.append (0)
             self.cont.append (-1)
-            if quests["demo"].get_val( "know_jelom" ) == 1:
+            if quests["demo"].get_val ("know_jelom") == 1:
 
                 self.player.append (4)
                 self.cont.append (1)
@@ -46,26 +46,32 @@ class jelom_start:
                 self.player.append (5)
                 self.cont.append (2)
             self.player.append (-1)
-        elif the_player.get_val( "at_silverhairs_door" ) == 1:
+        elif the_player.get_val ("at_silverhairs_door") == 1:
 
             self.color = the_npc.get_color()
             self.npc.append (1)
             self.cont.append (-1)
-            if quests["demo"].get_val ("know_talan_singing") != 2:
+            self.player.append (31)
+            self.cont.append (17)
+            if quests["demo"].get_val ("know_talan_singing") == 2 and 
the_npc.get_val ("not_convinced") == 1:
 
-                self.player.append (6)
-                self.cont.append (3)
-            elif quests["demo"].get_val ("know_talan_singing") == 2:
+                self.player.append (43)
+                self.cont.append (25)
+            if quests["demo"].get_val ("know_olivers_noise") == 1 and 
the_npc.get_val ("not_convinced") == 0:
 
                 self.player.append (7)
                 self.cont.append (4)
+            if quests["demo"].get_val ("know_olivers_noise") != 1 and 
quests["demo"].get_val ("know_talan_singing") != 2:
+
+                self.player.append (6)
+                self.cont.append (3)
             self.player.append (-1)
         elif the_player.get_val ("at_silverhairs_door") != 1 and 
quests["demo"].get_val ("know_jelom") != 2:
 
             self.color = the_npc.get_color()
             self.npc.append (2)
             self.cont.append (-1)
-            if quests["demo"].get_val( "know_jelom" ) == 1:
+            if quests["demo"].get_val ("know_jelom") == 1:
 
                 self.player.append (4)
                 self.cont.append (1)
@@ -80,168 +86,244 @@ class jelom_start:
             self.color = the_npc.get_color()
             self.npc.append (3)
             self.cont.append (-1)
-            if quests["demo"].get_val ("know_talan_singing") != 2:
+            if quests["demo"].get_val ("know_talan_singing") == 2 and 
the_npc.get_val ("not_convinced") == 1:
+
+                self.player.append (43)
+                self.cont.append (25)
+            if quests["demo"].get_val ("know_olivers_noise") != 1 and 
quests["demo"].get_val ("know_talan_singing") != 2:
 
                 self.player.append (6)
                 self.cont.append (3)
-            elif quests["demo"].get_val ("know_talan_singing") == 2:
+            if quests["demo"].get_val ("know_olivers_noise") == 1 and 
the_npc.get_val ("not_convinced") == 0:
 
                 self.player.append (7)
                 self.cont.append (4)
             self.player.append (-1)
 
-    def answer7 (self):
+    def answer6 (self):
         self.color = the_npc.get_color()
-        self.npc.append (12)
+        self.npc.append (11)
         self.cont.append (-1)
-        self.player.append (13)
-        self.cont.append (6)
+        if quests["demo"].get_val ("know_talan_singing") == 2 and 
the_npc.get_val ("not_convinced") == 1:
+
+            self.player.append (43)
+            self.cont.append (25)
+        if quests["demo"].get_val ("know_alek_eavesdrop") == 1 and 
quests["demo"].get_val ("know_olivers_noise") != 1 and quests["demo"].get_val 
("know_talan_singing") != 2:
+
+            self.player.append (22)
+            self.cont.append (12)
+        if quests["demo"].get_val ("ask_packed_gems") == 1 and 
quests["demo"].get_val ("know_olivers_noise") != 1 and quests["demo"].get_val 
("know_talan_singing") != 2:
+
+            self.player.append (21)
+            self.cont.append (11)
+        if quests["demo"].get_val ("know_olivers_noise") == 1 and 
the_npc.get_val ("not_convinced") == 0:
+
+            self.player.append (7)
+            self.cont.append (4)
+        else:
+
+            self.player.append (28)
+            self.cont.append (15)
         self.player.append (-1)
 
-    def answer13 (self):
+    def answer28 (self):
         self.color = the_npc.get_color()
-        self.npc.append (14)
+        self.npc.append (29)
         self.cont.append (-1)
-        self.player.append (15)
-        self.cont.append (7)
+        self.player.append (30)
+        self.cont.append (16)
         self.player.append (-1)
 
-    def answer15 (self):
+    def answer30 (self):
         self.color = the_npc.get_color()
-        self.npc.append (16)
+        self.npc.append (27)
         self.cont.append (-1)
-        self.player.append (17)
-        self.cont.append (8)
+        quests["demo"].set_val ("know_jelom" , 2)
+
         self.player.append (-1)
 
-    def answer17 (self):
+    def answer21 (self):
         self.color = the_npc.get_color()
-        self.npc.append (18)
+        self.npc.append (23)
         self.cont.append (-1)
-        self.player.append (19)
-        self.cont.append (9)
+        self.player.append (24)
+        self.cont.append (13)
         self.player.append (-1)
 
-    def answer19 (self):
+    def answer24 (self):
         self.color = the_npc.get_color()
-        self.npc.append (20)
+        self.npc.append (25)
         self.cont.append (-1)
-        self.player.append (21)
-        self.cont.append (10)
+        self.player.append (26)
+        self.cont.append (14)
         self.player.append (-1)
 
-    def answer21 (self):
+    def answer26 (self):
         self.color = the_npc.get_color()
-        self.npc.append (22)
+        self.npc.append (27)
         self.cont.append (-1)
-        self.player.append (23)
-        self.cont.append (11)
-        self.player.append (24)
-        self.cont.append (12)
-        self.player.append (-1)
+        quests["demo"].set_val ("know_jelom" , 2)
 
-    def answer24 (self):
-        quests["demo"].set_val( "told_on_talan", 1 );
+        self.player.append (-1)
 
+    def answer22 (self):
         self.color = the_npc.get_color()
-        self.npc.append (26)
+        self.npc.append (25)
         self.cont.append (-1)
-        self.player.append (27)
-        self.cont.append (13)
+        self.player.append (26)
+        self.cont.append (14)
         self.player.append (-1)
 
-    def answer27 (self):
+    def answer7 (self):
         self.color = the_npc.get_color()
-        self.npc.append (28)
+        self.npc.append (12)
         self.cont.append (-1)
-        self.player.append (29)
-        self.cont.append (14)
+        self.player.append (40)
+        self.cont.append (23)
         self.player.append (-1)
 
-    def answer29 (self):
+    def answer40 (self):
         self.color = the_npc.get_color()
-        self.npc.append (30)
+        self.npc.append (13)
         self.cont.append (-1)
-        quests["demo"].set_val( "silverhair_free", 1 );
+        self.player.append (41)
+        self.cont.append (24)
+        if quests["demo"].get_val ("know_talan_singing") == 2:
 
+            self.player.append (14)
+            self.cont.append (6)
         self.player.append (-1)
 
-    def answer23 (self):
+    def answer14 (self):
         self.color = the_npc.get_color()
-        self.npc.append (25)
+        self.npc.append (15)
         self.cont.append (-1)
-        self.player.append (27)
-        self.cont.append (13)
+        self.player.append (16)
+        self.cont.append (7)
+        self.player.append (17)
+        self.cont.append (8)
         self.player.append (-1)
 
-    def answer6 (self):
+    def answer17 (self):
+        quests["demo"].set_val ("told_on_talan" , 1)
+
         self.color = the_npc.get_color()
-        self.npc.append (11)
+        self.npc.append (19)
+        self.cont.append (10)
+        self.player.append (-1)
+
+    def answer19 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (20)
         self.cont.append (-1)
-        if quests["demo"].get_val ("know_alek_eavesdrop") == 1 and 
quests["demo"].get_val ("know_talan_singing") != 2:
+        self.player.append (44)
+        self.cont.append (26)
+        self.player.append (46)
+        self.cont.append (27)
+        self.player.append (-1)
 
-            self.player.append (32)
-            self.cont.append (16)
-        if quests["demo"].get_val ("ask_packed_gems") == 1 and 
quests["demo"].get_val ("know_talan_singing") != 2:
+    def answer46 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (47)
+        self.cont.append (28)
+        self.player.append (-1)
 
-            self.player.append (31)
-            self.cont.append (15)
-        elif quests["demo"].get_val ("know_talan_singing") == 2:
+    def answer47 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (48)
+        self.cont.append (-1)
+        quests["demo"].set_val ("silverhair_free" , 1)
 
-            self.player.append (7)
-            self.cont.append (4)
-        else:
+        self.player.append (-1)
+
+    def answer44 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (45)
+        self.cont.append (-1)
+        self.player.append (46)
+        self.cont.append (27)
+        self.player.append (-1)
 
-            self.player.append (38)
-            self.cont.append (19)
+    def answer16 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (18)
+        self.cont.append (9)
         self.player.append (-1)
 
-    def answer38 (self):
+    def answer18 (self):
         self.color = the_npc.get_color()
-        self.npc.append (39)
+        self.npc.append (20)
         self.cont.append (-1)
-        self.player.append (40)
-        self.cont.append (20)
+        self.player.append (44)
+        self.cont.append (26)
+        self.player.append (46)
+        self.cont.append (27)
         self.player.append (-1)
 
-    def answer40 (self):
+    def answer41 (self):
         self.color = the_npc.get_color()
-        self.npc.append (37)
+        self.npc.append (42)
         self.cont.append (-1)
-        quests["demo"].set_val ("know_jelom" , 2)
+        the_npc.set_val ("not_convinced" , 1     )
 
         self.player.append (-1)
 
+    def answer43 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (49)
+        self.cont.append (-1)
+        self.player.append (16)
+        self.cont.append (7)
+        self.player.append (17)
+        self.cont.append (8)
+        self.player.append (-1)
+
     def answer31 (self):
         self.color = the_npc.get_color()
-        self.npc.append (33)
+        self.npc.append (32)
         self.cont.append (-1)
+        self.player.append (33)
+        self.cont.append (18)
         self.player.append (34)
-        self.cont.append (17)
+        self.cont.append (19)
         self.player.append (-1)
 
     def answer34 (self):
         self.color = the_npc.get_color()
-        self.npc.append (35)
-        self.cont.append (-1)
-        self.player.append (36)
-        self.cont.append (18)
+        self.npc.append (39)
+        self.cont.append (22)
         self.player.append (-1)
 
-    def answer36 (self):
+    def answer39 (self):
         self.color = the_npc.get_color()
-        self.npc.append (37)
+        self.npc.append (38)
         self.cont.append (-1)
         quests["demo"].set_val ("know_jelom" , 2)
 
         self.player.append (-1)
 
-    def answer32 (self):
+    def answer33 (self):
         self.color = the_npc.get_color()
         self.npc.append (35)
         self.cont.append (-1)
+        self.player.append (34)
+        self.cont.append (19)
         self.player.append (36)
-        self.cont.append (18)
+        self.cont.append (20)
+        self.player.append (-1)
+
+    def answer36 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (37)
+        self.cont.append (21)
+        self.player.append (-1)
+
+    def answer37 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (38)
+        self.cont.append (-1)
+        quests["demo"].set_val ("know_jelom" , 2)
+
         self.player.append (-1)
 
     def answer5 (self):
@@ -250,28 +332,34 @@ 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)
 
     def answer10 (self):
         self.color = the_npc.get_color()
         self.npc.append (11)
         self.cont.append (-1)
-        if quests["demo"].get_val ("know_alek_eavesdrop") == 1 and 
quests["demo"].get_val ("know_talan_singing") != 2:
+        if quests["demo"].get_val ("know_talan_singing") == 2 and 
the_npc.get_val ("not_convinced") == 1:
 
-            self.player.append (32)
-            self.cont.append (16)
-        if quests["demo"].get_val ("ask_packed_gems") == 1 and 
quests["demo"].get_val ("know_talan_singing") != 2:
+            self.player.append (43)
+            self.cont.append (25)
+        if quests["demo"].get_val ("know_alek_eavesdrop") == 1 and 
quests["demo"].get_val ("know_olivers_noise") != 1 and quests["demo"].get_val 
("know_talan_singing") != 2:
 
-            self.player.append (31)
-            self.cont.append (15)
-        elif quests["demo"].get_val ("know_talan_singing") == 2:
+            self.player.append (22)
+            self.cont.append (12)
+        if quests["demo"].get_val ("ask_packed_gems") == 1 and 
quests["demo"].get_val ("know_olivers_noise") != 1 and quests["demo"].get_val 
("know_talan_singing") != 2:
+
+            self.player.append (21)
+            self.cont.append (11)
+        if quests["demo"].get_val ("know_olivers_noise") == 1 and 
the_npc.get_val ("not_convinced") == 0:
 
             self.player.append (7)
             self.cont.append (4)
         else:
 
-            self.player.append (38)
-            self.cont.append (19)
+            self.player.append (28)
+            self.cont.append (15)
         self.player.append (-1)
 
     def answer4 (self):