adonthell-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[adonthell-wastesedge-commits] Release_0-3-1 c0d92f8 138/237: Further cl


From: Kai Sterker
Subject: [adonthell-wastesedge-commits] Release_0-3-1 c0d92f8 138/237: Further cleaning up of dialogues
Date: Mon, 25 Jul 2016 18:15:06 +0000 (UTC)

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

    Further cleaning up of dialogues
---
 scripts/dialogues/demo_intro_1.py          |  128 +++++++++++++++-------------
 scripts/schedules/mapcharacters/intro.py   |    8 +-
 scripts/schedules/mapcharacters/tristan.py |   27 +++---
 3 files changed, 85 insertions(+), 78 deletions(-)

diff --git a/scripts/dialogues/demo_intro_1.py 
b/scripts/dialogues/demo_intro_1.py
index 42a7baf..5df6960 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?  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 ai [...]
+       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! [...]
 
        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.answer6, self.answer8, self.answer9, self.answer10, 
self.answer11, self.answer13, self.answer14, self.answer16, self.answer19, 
self.answer23, self.answer25, self.answer28, self.answer29, self.answer31, None]
+               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]
 
        def clear (self):
                del self.dialogue
@@ -41,31 +41,31 @@ class demo_intro_1:
                self.cont.append (-1)
                self.player.append (1)
                self.cont.append (1)
-               self.player.append (11)
+               self.player.append (10)
                self.cont.append (8)
                self.player.append (-1)
 
-       def answer11 (self):
+       def answer10 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (12)
+               self.npc.append (11)
                self.cont.append (-1)
-               self.player.append (13)
+               self.player.append (12)
                self.cont.append (9)
-               self.player.append (14)
+               self.player.append (13)
                self.cont.append (10)
                self.player.append (-1)
 
-       def answer14 (self):
+       def answer13 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (15)
+               self.npc.append (14)
                self.cont.append (-1)
-               self.player.append (16)
+               self.player.append (15)
                self.cont.append (11)
                self.player.append (-1)
 
-       def answer16 (self):
+       def answer15 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (17)
+               self.npc.append (16)
                self.cont.append (-1)
                self.player.append (4)
                self.cont.append (3)
@@ -75,113 +75,123 @@ class demo_intro_1:
 
        def answer3 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (7)
+               self.npc.append (6)
                self.cont.append (-1)
-               self.player.append (8)
+               self.player.append (7)
                self.cont.append (5)
-               self.player.append (9)
+               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 (20)
+               self.npc.append (19)
                self.cont.append (-1)
-               self.player.append (19)
+               self.player.append (18)
                self.cont.append (12)
                self.player.append (-1)
 
-       def answer19 (self):
+       def answer18 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (21)
+               self.npc.append (20)
                self.cont.append (-1)
-               self.player.append (10)
+               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 (27)
+               self.npc.append (26)
                self.cont.append (-1)
-               self.player.append (28)
-               self.cont.append (15)
-               self.player.append (29)
+               self.player.append (27)
                self.cont.append (16)
-               self.player.append (6)
+               self.player.append (28)
+               self.cont.append (17)
+               self.player.append (5)
                self.cont.append (4)
                self.player.append (-1)
 
-       def answer6 (self):
+       def answer5 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (22)
+               self.npc.append (21)
                self.cont.append (-1)
-               self.player.append (23)
+               self.player.append (22)
                self.cont.append (13)
+               self.player.append (24)
+               self.cont.append (15)
                self.player.append (-1)
 
-       def answer23 (self):
+       def answer24 (self):
                self.color = 0
-               self.npc.append (24)
-               self.cont.append (-1)
-               self.player.append (25)
+               self.npc.append (23)
                self.cont.append (14)
                self.player.append (-1)
 
-       def answer25 (self):
-               self.color = self.the_npc.get_color()
-               self.npc.append (26)
+       def answer23 (self):
+               self.color = 0
+               self.npc.append (25)
                self.cont.append (-1)
                self.the_npc.set_dialogue ("dialogues/talan_start")
 
                self.player.append (-1)
 
-       def answer29 (self):
+       def answer22 (self):
+               self.color = 0
+               self.npc.append (23)
+               self.cont.append (14)
+               self.player.append (-1)
+
+       def answer28 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (30)
+               self.npc.append (29)
                self.cont.append (-1)
-               self.player.append (31)
-               self.cont.append (17)
-               self.player.append (6)
+               self.player.append (30)
+               self.cont.append (18)
+               self.player.append (5)
                self.cont.append (4)
                self.player.append (-1)
 
-       def answer31 (self):
+       def answer30 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (32)
+               self.npc.append (31)
                self.cont.append (-1)
-               self.player.append (6)
-               self.cont.append (4)
+               self.player.append (22)
+               self.cont.append (13)
+               self.player.append (24)
+               self.cont.append (15)
                self.player.append (-1)
 
-       def answer28 (self):
+       def answer27 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (30)
+               self.npc.append (29)
                self.cont.append (-1)
-               self.player.append (31)
-               self.cont.append (17)
-               self.player.append (6)
+               self.player.append (30)
+               self.cont.append (18)
+               self.player.append (5)
                self.cont.append (4)
                self.player.append (-1)
 
-       def answer8 (self):
+       def answer7 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (18)
+               self.npc.append (17)
                self.cont.append (-1)
-               self.player.append (19)
+               self.player.append (18)
                self.cont.append (12)
                self.player.append (-1)
 
        def answer4 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (5)
+               self.npc.append (26)
                self.cont.append (-1)
-               self.player.append (6)
+               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 (10)
-               self.cont.append (7)
                self.player.append (-1)
 
-       def answer13 (self):
+       def answer12 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (2)
                self.cont.append (-1)
diff --git a/scripts/schedules/mapcharacters/intro.py 
b/scripts/schedules/mapcharacters/intro.py
index 1bc82fb..cc2fb4c 100644
--- a/scripts/schedules/mapcharacters/intro.py
+++ b/scripts/schedules/mapcharacters/intro.py
@@ -19,25 +19,25 @@ class intro:
     def __init__ (self, mapcharacterinstance):
         self.myself = mapcharacterinstance
 
-        self.myself.set_val ("talk_to_talan", 1)
+        adonthell.gamedata_get_quest ("demo").set_val ("intro_on", 1)
 
 
     def run (self):
         myself = self.myself
-        talk = myself.get_val ("talk_to_talan")
+        talk = adonthell.gamedata_get_quest ("demo").get_val ("intro_on")
 
         # -- first talk to talan to get into the inn
         if talk == 1:
             talan = adonthell.gamedata_get_character ("Talan Wendth")
             talan.launch_action (myself)
 
-            myself.set_val ("talk_to_talan", 2)
+            adonthell.gamedata_get_quest ("demo").set_val ("intro_on", 2)
 
         # -- open the gate
         elif talk == 2:
             self.open_gate ()
 
-            myself.set_val ("talk_to_talan", 0)
+            adonthell.gamedata_get_quest ("demo").set_val ("intro_on", 0)
             myself.set_goal (10, 18, adonthell.STAND_EAST)
 
         # -- move in and finally enable keyboard control
diff --git a/scripts/schedules/mapcharacters/tristan.py 
b/scripts/schedules/mapcharacters/tristan.py
index 52cee7f..4057bfa 100644
--- a/scripts/schedules/mapcharacters/tristan.py
+++ b/scripts/schedules/mapcharacters/tristan.py
@@ -15,9 +15,8 @@
 #    Illig will either be in the common room or outside at the gate.
 
 
-from adonthell import STAND_NORTH, STAND_SOUTH, STAND_EAST, STAND_WEST
 import adonthell
-from random import randint
+import random
 
 class tristan:
 
@@ -46,13 +45,17 @@ class tristan:
         # -- get movement target
         elif todo == 1:
             # -- in common room -> go outside
-            if myself.submap () == 1:
-                myself.set_goal (13, 8, STAND_SOUTH)
+            if myself.submap () == 1 and \
+                adonthell.gamedata_get_quest ("demo").get_val ("intro_on") == 
0:
+                myself.set_goal (13, 8, adonthell.STAND_SOUTH)
+                delay = random.randint (100, 150) * 30
 
             # -- outside -> goto common room
             else:
-                myself.set_goal (18, 13, STAND_NORTH)
+                myself.set_goal (18, 13, adonthell.STAND_NORTH)
+                delay = random.randint (75, 150) * 30
 
+            myself.set_val ("delay", delay)
             myself.set_val ("todo", 2)
 
         # -- move
@@ -60,17 +63,11 @@ class tristan:
             if myself.follow_path () == 1:
                 # -- reached common room
                 if myself.submap () == 1 and myself.posx () == 13:
-                    myself.set_goal (4, 6, STAND_WEST)
-
-                    delay = randint (75, 150) * 30
-                    myself.set_val ("delay", delay)
+                    myself.set_goal (4, 6, adonthell.STAND_WEST)
 
                 # -- reached yard
                 elif myself.submap () == 0 and myself.posx () == 18:
-                    myself.set_goal (12, 18, STAND_WEST)
-
-                    delay = randint (100, 150) * 30
-                    myself.set_val ("delay", delay)
+                    myself.set_goal (12, 18, adonthell.STAND_WEST)
 
                 # -- reached our final destination
                 else:
@@ -82,6 +79,6 @@ class tristan:
         myself.set_val ("say_something", tmp - 1)
 
         if tmp == 0:
-            myself.speak (self.speech[randint (0, 2)])
-            delay = randint (50, 150) * 22
+            myself.speak (self.speech[random.randint (0, 2)])
+            delay = random.randint (50, 150) * 22
             myself.set_val ("say_something", delay)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]