[adonthell-wastesedge-commits] Release_0-3-1 7a54bfe 200/237: RESTRUCTURED Jelom a little

[Kai Sterker]

tag: Release_0-3-1
commit 7a54bfe3a39229c5b0a74e85e8392e6b68b8d10c
Author: adondev <adondev>
Commit: adondev <adondev>

    RESTRUCTURED Jelom a little
---
 scripts/dialogues/jelom_start.py |  184 +++++++++++++++++++++-----------------
 1 file changed, 100 insertions(+), 84 deletions(-)

diff --git a/scripts/dialogues/jelom_start.py b/scripts/dialogues/jelom_start.py
index bbb7dd3..a87e612 100644
--- a/scripts/dialogues/jelom_start.py
+++ b/scripts/dialogues/jelom_start.py
@@ -2,7 +2,7 @@ import adonthell
 
 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, I  [...]
+       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 regarding the theft.", "Loo [...]
 
        def set_name (self, new_name):
                pass
@@ -17,7 +17,7 @@ class jelom_start:
                self.the_player = p
                self.the_npc = n
 
-               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]
+               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, self.answer51, self.answer52, None]
 
        def clear (self):
                del self.dialogue
@@ -58,15 +58,15 @@ class jelom_start:
                        self.cont.append (-1)
                        self.player.append (31)
                        self.cont.append (17)
-                       if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2 and self.the_npc.get_val ("not_convinced") == 1:
-
-                               self.player.append (43)
-                               self.cont.append (25)
-                       if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") == 1 and self.the_npc.get_val ("not_convinced") == 0:
+                       if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") == 1 and self.the_npc.get_val ("not_convinced") == 0 and 
self.the_npc.get_val ("allows_meddling") == 1:
 
                                self.player.append (7)
                                self.cont.append (4)
-                       if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") != 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
+                       elif adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2 and self.the_npc.get_val ("not_convinced") == 1:
+
+                               self.player.append (43)
+                               self.cont.append (25)
+                       else:
 
                                self.player.append (6)
                                self.cont.append (3)
@@ -91,61 +91,51 @@ class jelom_start:
                        self.color = self.the_npc.get_color()
                        self.npc.append (3)
                        self.cont.append (-1)
-                       if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2 and self.the_npc.get_val ("not_convinced") == 1:
+                       if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") == 1 and self.the_npc.get_val ("not_convinced") == 0 and 
self.the_npc.get_val ("allows_meddling") == 1:
+
+                               self.player.append (7)
+                               self.cont.append (4)
+                       elif adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2 and self.the_npc.get_val ("not_convinced") == 1:
 
                                self.player.append (43)
                                self.cont.append (25)
-                       if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") != 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
+                       else:
 
                                self.player.append (6)
                                self.cont.append (3)
-                       if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") == 1 and self.the_npc.get_val ("not_convinced") == 0:
-
-                               self.player.append (7)
-                               self.cont.append (4)
                        self.player.append (-1)
 
        def answer6 (self):
-               self.color = self.the_npc.get_color()
-               self.npc.append (11)
-               self.cont.append (-1)
-               if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2 and self.the_npc.get_val ("not_convinced") == 1:
+               if self.the_npc.get_val ("allows_meddling") == 0:
 
-                       self.player.append (43)
-                       self.cont.append (25)
-               if adonthell.gamedata_get_quest("demo").get_val 
("know_alek_eavesdrop") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") != 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
-
-                       self.player.append (22)
-                       self.cont.append (12)
-               if adonthell.gamedata_get_quest("demo").get_val 
("ask_packed_gems") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") != 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
-
-                       self.player.append (21)
-                       self.cont.append (11)
-               if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") == 1 and self.the_npc.get_val ("not_convinced") == 0:
+                       self.color = self.the_npc.get_color()
+                       self.npc.append (52)
+                       self.cont.append (30)
+                       self.the_npc.set_val ("allows_meddling" , 1)
 
-                       self.player.append (7)
-                       self.cont.append (4)
+                       self.player.append (-1)
                else:
 
-                       self.player.append (28)
-                       self.cont.append (15)
-               self.player.append (-1)
+                       self.color = self.the_npc.get_color()
+                       self.npc.append (11)
+                       self.cont.append (-1)
+                       if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
 
-       def answer28 (self):
-               self.color = self.the_npc.get_color()
-               self.npc.append (29)
-               self.cont.append (-1)
-               self.player.append (30)
-               self.cont.append (16)
-               self.player.append (-1)
+                               self.player.append (28)
+                               self.cont.append (15)
+                       if adonthell.gamedata_get_quest("demo").get_val 
("know_alek_eavesdrop") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
 
-       def answer30 (self):
-               self.color = self.the_npc.get_color()
-               self.npc.append (27)
-               self.cont.append (-1)
-               adonthell.gamedata_get_quest("demo").set_val ("know_jelom" , 2)
+                               self.player.append (22)
+                               self.cont.append (12)
+                       if adonthell.gamedata_get_quest("demo").get_val 
("ask_packed_gems") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
 
-               self.player.append (-1)
+                               self.player.append (21)
+                               self.cont.append (11)
+                       elif adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2 and self.the_npc.get_val ("not_convinced") == 1:
+
+                               self.player.append (43)
+                               self.cont.append (25)
+                       self.player.append (-1)
 
        def answer21 (self):
                self.color = self.the_npc.get_color()
@@ -179,29 +169,43 @@ class jelom_start:
                self.cont.append (14)
                self.player.append (-1)
 
-       def answer7 (self):
+       def answer28 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (12)
+               self.npc.append (29)
                self.cont.append (-1)
-               self.player.append (40)
-               self.cont.append (23)
+               self.player.append (30)
+               self.cont.append (16)
                self.player.append (-1)
 
-       def answer40 (self):
+       def answer30 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (13)
+               self.npc.append (27)
                self.cont.append (-1)
-               self.player.append (41)
-               self.cont.append (24)
-               if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2:
+               adonthell.gamedata_get_quest("demo").set_val ("know_jelom" , 2)
 
-                       self.player.append (14)
-                       self.cont.append (6)
                self.player.append (-1)
 
-       def answer14 (self):
+       def answer52 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (15)
+               self.npc.append (53)
+               self.cont.append (-1)
+               if adonthell.gamedata_get_quest("demo").get_val 
("know_alek_eavesdrop") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
+
+                       self.player.append (22)
+                       self.cont.append (12)
+               if adonthell.gamedata_get_quest("demo").get_val 
("ask_packed_gems") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
+
+                       self.player.append (21)
+                       self.cont.append (11)
+               if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
+
+                       self.player.append (28)
+                       self.cont.append (15)
+               self.player.append (-1)
+
+       def answer43 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (49)
                self.cont.append (-1)
                self.player.append (16)
                self.cont.append (7)
@@ -266,17 +270,29 @@ class jelom_start:
                self.cont.append (27)
                self.player.append (-1)
 
-       def answer41 (self):
+       def answer7 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (42)
+               self.npc.append (12)
                self.cont.append (-1)
-               self.the_npc.set_val ("not_convinced" , 1     )
+               self.player.append (40)
+               self.cont.append (23)
+               self.player.append (-1)
+
+       def answer40 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (13)
+               self.cont.append (-1)
+               self.player.append (41)
+               self.cont.append (24)
+               if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2:
 
+                       self.player.append (14)
+                       self.cont.append (6)
                self.player.append (-1)
 
-       def answer43 (self):
+       def answer14 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (49)
+               self.npc.append (15)
                self.cont.append (-1)
                self.player.append (16)
                self.cont.append (7)
@@ -284,6 +300,14 @@ class jelom_start:
                self.cont.append (8)
                self.player.append (-1)
 
+       def answer41 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (42)
+               self.cont.append (-1)
+               self.the_npc.set_val ("not_convinced" , 1     )
+
+               self.player.append (-1)
+
        def answer31 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (32)
@@ -344,29 +368,21 @@ class jelom_start:
 
        def answer10 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (11)
+               self.npc.append (50)
                self.cont.append (-1)
-               if adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") == 2 and self.the_npc.get_val ("not_convinced") == 1:
-
-                       self.player.append (43)
-                       self.cont.append (25)
-               if adonthell.gamedata_get_quest("demo").get_val 
("know_alek_eavesdrop") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") != 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
+               self.player.append (51)
+               self.cont.append (29)
+               self.player.append (-1)
 
-                       self.player.append (22)
-                       self.cont.append (12)
-               if adonthell.gamedata_get_quest("demo").get_val 
("ask_packed_gems") == 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") != 1 and adonthell.gamedata_get_quest("demo").get_val 
("know_talan_singing") != 2:
+       def answer51 (self):
+               if self.the_npc.get_val ("allows_meddling") == 0:
 
-                       self.player.append (21)
-                       self.cont.append (11)
-               if adonthell.gamedata_get_quest("demo").get_val 
("know_olivers_noise") == 1 and self.the_npc.get_val ("not_convinced") == 0:
-
-                       self.player.append (7)
-                       self.cont.append (4)
-               else:
+                       self.color = self.the_npc.get_color()
+                       self.npc.append (52)
+                       self.cont.append (30)
+                       self.the_npc.set_val ("allows_meddling" , 1)
 
-                       self.player.append (28)
-                       self.cont.append (15)
-               self.player.append (-1)
+                       self.player.append (-1)
 
        def answer4 (self):
                self.color = self.the_npc.get_color()