[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 8d71e77 171/237: FINISHED e
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 8d71e77 171/237: FINISHED extro dialogue |
|
Date: |
Mon, 25 Jul 2016 18:15:09 +0000 (UTC) |
tag: Release_0-3-1
commit 8d71e77db9a853e35c135c5ce82be319ef68d6ed
Author: adondev <adondev>
Commit: adondev <adondev>
FINISHED extro dialogue
---
scripts/dialogues/extro.py | 306 ++++++++++++++++++++++++++++++--------
scripts/dialogues/sarin_start.py | 22 ++-
scripts/events/Makefile.am | 3 +-
scripts/modules/intro.py | 2 +-
4 files changed, 259 insertions(+), 74 deletions(-)
diff --git a/scripts/dialogues/extro.py b/scripts/dialogues/extro.py
index ecd1291..99814f2 100644
--- a/scripts/dialogues/extro.py
+++ b/scripts/dialogues/extro.py
@@ -2,7 +2,7 @@ import adonthell
class extro:
loop = []
- strings = ["What is going on here? What are all these people doing in
my room? Are you behind this, Half-Elf? I demand an explanation!", "Please calm
down Master Fingolson. We are here to sort out this business once and for
all.", "Sort this business out? Good ... good! It's about time, I'd say! So ...
will that foul Elf finally return my Catseyes? I hear one was found amongst her
belongings. And where there is one, the others shouldn't be far.", "I fear you
are mistaken my good Dwarf. [...]
+ strings = ["What is going on here? What are all these people doing in
my room? Are you behind this, Half-Elf? I demand an explanation!", "Please calm
down Master Fingolson. We are here to sort out this business once and for
all.", "Sort this business out? Good ... good! It's about time, I'd say! So ...
will that foul Elf finally return my Catseyes? I hear one was found amongst her
belongings. And where there is one, the others shouldn't be far.", "I fear you
are mistaken my good Dwarf. [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class extro:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer0, self.answer1,
self.answer2, self.answer3, self.answer4, self.answer8, self.answer10,
self.answer11, self.answer12, self.answer13, self.answer14, self.answer15,
self.answer16, self.answer17, self.answer19, self.answer20, self.answer21,
self.answer23, self.answer56, self.answer58, self.answer63, self.answer69,
self.answer71, self.answer74, None]
+ self.dialogue = [self.start, self.answer0, self.answer1,
self.answer2, self.answer3, self.answer4, self.answer6, self.answer7,
self.answer8, self.answer10, self.answer11, self.answer12, self.answer13,
self.answer14, self.answer15, self.answer16, self.answer17, self.answer19,
self.answer20, self.answer21, self.answer24, self.answer25, self.answer26,
self.answer28, self.answer30, self.answer31, self.answer32, self.answer33,
self.answer36, self.answer37, self.answer38, self.answer40, self [...]
def clear (self):
del self.dialogue
@@ -71,11 +71,11 @@ class extro:
self.npc.append (5)
self.cont.append (-1)
self.player.append (6)
- self.cont.append (-1)
+ self.cont.append (6)
self.player.append (7)
- self.cont.append (-1)
+ self.cont.append (7)
self.player.append (8)
- self.cont.append (6)
+ self.cont.append (8)
self.player.append (-1)
def answer8 (self):
@@ -84,57 +84,57 @@ class extro:
self.npc.append (9)
self.cont.append (-1)
self.player.append (10)
- self.cont.append (7)
+ self.cont.append (9)
self.player.append (11)
- self.cont.append (8)
+ self.cont.append (10)
self.player.append (-1)
def answer11 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (12)
- self.cont.append (9)
+ self.cont.append (11)
self.player.append (-1)
def answer12 (self):
self.set_npc ("Erek Stonebreaker")
self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
self.npc.append (13)
- self.cont.append (10)
+ self.cont.append (12)
self.player.append (-1)
def answer13 (self):
self.set_npc ("Bjarn Fingolson")
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (14)
- self.cont.append (11)
+ self.cont.append (13)
self.player.append (-1)
def answer14 (self):
self.set_npc ("Erek Stonebreaker")
self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
self.npc.append (15)
- self.cont.append (12)
+ self.cont.append (14)
self.player.append (-1)
def answer15 (self):
self.set_npc ("Jelom Rasgar")
self.color = adonthell.gamedata_get_character("Jelom
Rasgar").get_color()
self.npc.append (16)
- self.cont.append (13)
+ self.cont.append (15)
self.player.append (-1)
def answer16 (self):
self.set_npc ("Bjarn Fingolson")
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (17)
- self.cont.append (14)
+ self.cont.append (16)
self.player.append (-1)
def answer17 (self):
self.set_npc ("Erek Stonebreaker")
self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
self.npc.append (19)
- self.cont.append (15)
+ self.cont.append (17)
self.player.append (-1)
def answer19 (self):
@@ -142,105 +142,283 @@ class extro:
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (18)
self.cont.append (-1)
- self.player.append (20)
- self.cont.append (16)
self.player.append (21)
- self.cont.append (17)
+ self.cont.append (19)
+ if self.guess_deceit == 1:
+
+ self.player.append (46)
+ self.cont.append (-1)
+ if self.guess_deceit == 0:
+
+ self.player.append (20)
+ self.cont.append (18)
self.player.append (-1)
- def answer21 (self):
+ def answer20 (self):
+ self.guess_deceit = 1
+
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
- self.npc.append (22)
- self.cont.append (-1)
- self.player.append (23)
- self.cont.append (18)
- self.player.append (24)
+ self.npc.append (33)
+ self.cont.append (27)
+ self.player.append (-1)
+
+ def answer33 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (34)
self.cont.append (-1)
+ if self.guess_deceit == 1:
+
+ self.player.append (46)
+ self.cont.append (-1)
self.player.append (-1)
- def answer24 (self):
+ def answer46 (self):
pass
- def answer23 (self):
+ def answer21 (self):
+ self.guess_deceit = 1
+
+
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
- self.npc.append (25)
+ self.npc.append (22)
self.cont.append (-1)
+ if self.guess_deceit == 1:
+
+ self.player.append (46)
+ self.cont.append (-1)
self.player.append (-1)
- def answer20 (self):
+ def answer10 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
- self.npc.append (36)
- self.cont.append (24)
+ self.npc.append (23)
+ self.cont.append (-1)
+ self.player.append (25)
+ self.cont.append (21)
+ if self.not_guilty != 1:
+
+ self.player.append (24)
+ self.cont.append (20)
self.player.append (-1)
- def answer74 (self):
+ def answer24 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
- self.npc.append (37)
- self.cont.append (-1)
- self.player.append (38)
+ self.npc.append (49)
self.cont.append (-1)
+ self.player.append (25)
+ self.cont.append (21)
+ self.player.append (50)
+ self.cont.append (37)
+ self.player.append (11)
+ self.cont.append (10)
self.player.append (-1)
- def answer78 (self):
- pass
+ def answer50 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (32)
+ self.cont.append (26)
+ self.player.append (-1)
- def answer10 (self):
+ def answer32 (self):
+ self.set_npc ("Erek Stonebreaker")
+ self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
+ self.npc.append (13)
+ self.cont.append (12)
+ self.player.append (-1)
+
+ def answer25 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (26)
- self.cont.append (-1)
- self.player.append (27)
+ self.cont.append (22)
+ self.player.append (-1)
+
+ def answer26 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (27)
self.cont.append (-1)
self.player.append (28)
- self.cont.append (19)
+ self.cont.append (23)
+ if self.guess_deceit == 0:
+
+ self.player.append (20)
+ self.cont.append (18)
self.player.append (-1)
- def answer56 (self):
+ def answer28 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (29)
- self.cont.append (20)
+ self.cont.append (-1)
+ self.player.append (30)
+ self.cont.append (24)
+ self.player.append (31)
+ self.cont.append (25)
self.player.append (-1)
- def answer58 (self):
+ def answer31 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (32)
+ self.cont.append (26)
+ self.player.append (-1)
+
+ def answer30 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
- self.npc.append (30)
+ self.npc.append (47)
self.cont.append (-1)
- self.player.append (20)
- self.cont.append (16)
- self.player.append (31)
- self.cont.append (21)
+ self.player.append (48)
+ self.cont.append (36)
self.player.append (-1)
- def answer63 (self):
+ def answer48 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
- self.npc.append (32)
+ self.npc.append (41)
+ self.cont.append (32)
+ self.guess_deceit = 1
+
+ self.player.append (-1)
+
+ def answer41 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (42)
self.cont.append (-1)
- self.player.append (33)
+ self.player.append (44)
+ self.cont.append (34)
+ if adonthell.gamedata_get_quest("demo").get_val
("know_bjarns_insult") == 1:
+
+ self.player.append (43)
+ self.cont.append (33)
+ self.player.append (-1)
+
+ def answer43 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (51)
self.cont.append (-1)
- self.player.append (34)
- self.cont.append (22)
+ self.player.append (52)
+ self.cont.append (38)
self.player.append (-1)
- def answer69 (self):
+ def answer52 (self):
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
- self.npc.append (35)
- self.cont.append (23)
+ self.npc.append (45)
+ self.cont.append (35)
self.player.append (-1)
- def answer71 (self):
+ def answer45 (self):
self.set_npc ("Erek Stonebreaker")
self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
self.npc.append (13)
- self.cont.append (10)
+ self.cont.append (12)
self.player.append (-1)
- def answer67 (self):
- pass
-
- def answer54 (self):
- pass
+ def answer44 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (45)
+ self.cont.append (35)
+ self.player.append (-1)
def answer7 (self):
- pass
+ self.color = adonthell.gamedata_get_character("Jelom
Rasgar").get_color()
+ self.npc.append (35)
+ self.cont.append (-1)
+ self.player.append (36)
+ self.cont.append (28)
+ self.player.append (37)
+ self.cont.append (29)
+ self.player.append (-1)
+
+ def answer37 (self):
+ self.color = adonthell.gamedata_get_character("Jelom
Rasgar").get_color()
+ self.npc.append (38)
+ self.cont.append (30)
+ self.player.append (-1)
+
+ def answer38 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (39)
+ self.cont.append (-1)
+ self.player.append (40)
+ self.cont.append (31)
+ self.player.append (-1)
+
+ def answer40 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (41)
+ self.cont.append (32)
+ self.guess_deceit = 1
+
+ self.player.append (-1)
+
+ def answer36 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (53)
+ self.cont.append (-1)
+ self.player.append (10)
+ self.cont.append (9)
+ self.player.append (54)
+ self.cont.append (39)
+ self.player.append (-1)
+
+ def answer54 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (49)
+ self.cont.append (-1)
+ self.player.append (25)
+ self.cont.append (21)
+ self.player.append (50)
+ self.cont.append (37)
+ self.player.append (11)
+ self.cont.append (10)
+ self.player.append (-1)
def answer6 (self):
- pass
+ self.set_npc ("Bjarn Fingolson")
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (55)
+ self.cont.append (-1)
+ self.player.append (56)
+ self.cont.append (40)
+ self.player.append (58)
+ self.cont.append (41)
+ self.player.append (-1)
+
+ def answer58 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (60)
+ self.cont.append (-1)
+ self.player.append (61)
+ self.cont.append (43)
+ self.player.append (-1)
+
+ def answer61 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (32)
+ self.cont.append (26)
+ self.player.append (-1)
+
+ def answer56 (self):
+ self.set_npc ("Jelom Rasgar")
+ self.color = adonthell.gamedata_get_character("Jelom
Rasgar").get_color()
+ self.npc.append (57)
+ self.cont.append (-1)
+ self.player.append (59)
+ self.cont.append (42)
+ self.player.append (-1)
+
+ def answer59 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (62)
+ self.cont.append (-1)
+ self.not_guilty = 1
+
+ self.player.append (10)
+ self.cont.append (9)
+ self.player.append (63)
+ self.cont.append (44)
+ self.player.append (-1)
+
+ def answer63 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (32)
+ self.cont.append (26)
+ self.player.append (-1)
diff --git a/scripts/dialogues/sarin_start.py b/scripts/dialogues/sarin_start.py
index 60cf97a..dfff134 100755
--- a/scripts/dialogues/sarin_start.py
+++ b/scripts/dialogues/sarin_start.py
@@ -2,7 +2,7 @@ import adonthell
class sarin_start:
loop = []
- strings = ["What insolence! $name, do you believe the depths of what
they have done to our Lady? To accuse her of common theft, as if she was a
human! And to lock her away in this tiny, dirty room! I tell you, I cannot
bear it.", "I understand, Sarin, but we must bear this for now. At least until
I have been able to uncover the truth.", "The truth? The truth is that our
Lady is innocent and that, that Dwarf ruffian, he's a liar.", "Perhaps so.
Hopefully, we shall see whether he i [...]
+ strings = ["What insolence! $name, do you believe the depths of what
they have done to our Lady? To accuse her of common theft, as if she was a
human! And to lock her away in this tiny, dirty room! I tell you, I cannot bear
it.", "I understand, Sarin, but we must bear this for now. At least until I
have been able to uncover the truth.", "The truth? The truth is that our Lady
is innocent and that, that Dwarf ruffian, he's a liar.", "Perhaps so.
Hopefully, we shall see whether he is. What [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class sarin_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer1, self.answer3,
self.answer5, self.answer7, self.answer9, self.answer11, None]
+ self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer5, self.answer7, self.answer9, self.answer11, None]
def clear (self):
del self.dialogue
@@ -45,8 +45,10 @@ class sarin_start:
self.cont.append (-1)
self.player.append (3)
self.cont.append (2)
- self.player.append (11)
- self.cont.append (6)
+ if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") >= 3:
+
+ self.player.append (11)
+ self.cont.append (7)
self.player.append (-1)
def answer11 (self):
@@ -58,9 +60,15 @@ class sarin_start:
def answer3 (self):
self.color = adonthell.gamedata_get_character("Sarin
Trailfollower").get_color()
self.npc.append (4)
+ self.cont.append (3)
+ self.player.append (-1)
+
+ def answer4 (self):
+ self.color = adonthell.gamedata_get_character("Sarin
Trailfollower").get_color()
+ self.npc.append (13)
self.cont.append (-1)
self.player.append (5)
- self.cont.append (3)
+ self.cont.append (4)
self.player.append (-1)
def answer5 (self):
@@ -68,11 +76,11 @@ class sarin_start:
self.npc.append (6)
self.cont.append (-1)
self.player.append (7)
- self.cont.append (4)
+ self.cont.append (5)
if adonthell.gamedata_get_quest("demo").get_val
("know_frostbloom") == 1:
self.player.append (9)
- self.cont.append (5)
+ self.cont.append (6)
self.player.append (-1)
def answer9 (self):
diff --git a/scripts/events/Makefile.am b/scripts/events/Makefile.am
index b15ad4e..e169e8b 100755
--- a/scripts/events/Makefile.am
+++ b/scripts/events/Makefile.am
@@ -11,5 +11,4 @@ all:
*.pyc: *.py
-clean:
- rm -f *.pyc
+CLEANFILES = *.pyc
diff --git a/scripts/modules/intro.py b/scripts/modules/intro.py
index 6fe5967..143837d 100644
--- a/scripts/modules/intro.py
+++ b/scripts/modules/intro.py
@@ -102,7 +102,7 @@ the harshness of the road.",
\nEventually you find the Redwyne Inn,\nwhich seems to be the main
building\nhere.",
"The heavy wooden doors are closed,\nand no one is there \
to let you in. As you\napproach the gate, you suddenly hear a voice from
within.",
- " \nSuddently, it looked like the day
would\nbe harder than you thought...")
+ " \nSuddenly, it looked like the day would\nbe
harder than I thought ...")
cont.set_visible_background (0);
cont.set_visible_border (0);
- [adonthell-wastesedge-commits] Release_0-3-1 4defa7b 194/237: FIXED bug, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 4defa7b 194/237: FIXED bug, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d190e60 164/237: FIXED the mess I made with my last update :(, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 25cd3d4 153/237: Improved Eyes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bb956f2 196/237: ADDED shutdown, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a4da9a 234/237: ADDED ability to build RPM package, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7e2a6c6 157/237: FIXED some bugs, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bc3ef93 217/237: ADDED PLAYING file, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3502543 201/237: added running alek., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e74fdec 226/237: ADDED music to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dc927e9 184/237: FIXED some problems with the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8d71e77 171/237: FINISHED extro dialogue,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 b1e9ee0 231/237: FORGOT to distribute one schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 00147c0 211/237: IMPROVED Silverhair's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f8fcdd6 218/237: FIXED music link in extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 da8d94a 168/237: Completed intro sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b9766b 237/237: FIXES to configure Adonthell for Solaris, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 40be0c6 014/237: Added two dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e3409db 177/237: CHANGED sfx, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c82deb8 163/237: ADDED more 'gimmicks', Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 83261fc 112/237: FIXED installation of character_screen.py, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0adcb1b 204/237: REMIXED some songs, Kai Sterker, 2016/07/25