[adonthell-wastesedge-commits] Release_0-3-1 398bec8 143/237: IMPROVED Bjarn's dialogue and text bubbles

[Kai Sterker]

tag: Release_0-3-1
commit 398bec8862dd38063dea9728a3720513e7ccbdf0
Author: adondev <adondev>
Commit: adondev <adondev>

    IMPROVED Bjarn's dialogue and text bubbles
---
 scripts/dialogues/bjarn_start.py         |   83 ++++++++++++++++++++----------
 scripts/dialogues/erek_start.py          |    4 +-
 scripts/schedules/mapcharacters/bjarn.py |    2 +-
 3 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/scripts/dialogues/bjarn_start.py b/scripts/dialogues/bjarn_start.py
index 84a3ab2..a2f4324 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 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  [...]
+       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.answer11, 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.answer65, self.answer67, self.answer69, None]
 
        def clear (self):
                del self.dialogue
@@ -112,7 +112,7 @@ class bjarn_start:
 
        def answer11 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (31)
+               self.npc.append (27)
                self.cont.append (-1)
                self.player.append (-1)
 
@@ -128,7 +128,7 @@ class bjarn_start:
 
                        self.player.append (15)
                        self.cont.append (11)
-               if adonthell.gamedata_get_quest("demo").get_val 
("ask_packed_gems") == 1:
+               if adonthell.gamedata_get_quest("demo").get_val 
("ask_packed_gems") >= 1:
 
                        self.player.append (14)
                        self.cont.append (10)
@@ -140,20 +140,53 @@ class bjarn_start:
                self.cont.append (-1)
                self.player.append (18)
                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 (14)
+               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 answer65 (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 answer67 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (35)
+               self.cont.append (22)
+               self.player.append (-1)
+
+       def answer69 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (36)
+               self.cont.append (-1)
+               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 (16)
                self.player.append (-1)
@@ -161,43 +194,39 @@ class bjarn_start:
        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 (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 (29)
-               self.cont.append (18)
                self.player.append (-1)
 
-       def answer29 (self):
+       def answer22 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (30)
-               self.cont.append (-1)
+               self.npc.append (23)
+               self.cont.append (15)
                self.player.append (-1)
 
-       def answer15 (self):
+       def answer23 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (21)
+               self.npc.append (24)
                self.cont.append (-1)
+               self.player.append (29)
+               self.cont.append (18)
+               self.player.append (30)
+               self.cont.append (19)
                self.player.append (-1)
 
-       def answer16 (self):
+       def answer30 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (22)
+               self.npc.append (31)
                self.cont.append (-1)
-               self.player.append (23)
-               self.cont.append (15)
                self.player.append (-1)
 
-       def answer23 (self):
+       def answer29 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (24)
-               self.cont.append (-1)
-               self.player.append (25)
-               self.cont.append (16)
+               self.npc.append (26)
+               self.cont.append (17)
                self.player.append (-1)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 754a7e5..aa3836d 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 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 [...]
+       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
@@ -333,6 +333,8 @@ class erek_start:
                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)
diff --git a/scripts/schedules/mapcharacters/bjarn.py 
b/scripts/schedules/mapcharacters/bjarn.py
index 4e0ce91..d414833 100644
--- a/scripts/schedules/mapcharacters/bjarn.py
+++ b/scripts/schedules/mapcharacters/bjarn.py
@@ -23,7 +23,7 @@ class bjarn:
         self.myself = mapcharacterinstance
         self.speech = ["Ha! A tradesman is an honourable person, they say!", \
                        "Why don't they just take that Silverhair woman to 
prison!?", \
-                       "Elves! Their heads in the sky and their minds full of 
clouds!"]
+                       "Elves! The head in the sky and the mind full of 
clouds!"]
 
         self.coords = [(7, 5, adonthell.STAND_WEST), \
                        (2, 4, adonthell.STAND_SOUTH), \