[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 c49550c 161/237: IMPROVED E
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 c49550c 161/237: IMPROVED Erek slightly |
|
Date: |
Mon, 25 Jul 2016 18:15:09 +0000 (UTC) |
tag: Release_0-3-1
commit c49550c513ec3f9632230f2b7f210713b1191855
Author: adondev <adondev>
Commit: adondev <adondev>
IMPROVED Erek slightly
---
scripts/dialogues/erek_start.py | 88 +++++++++++++++++++++------------------
1 file changed, 47 insertions(+), 41 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 779268d..6dc8803 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
@@ -17,7 +17,7 @@ class erek_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer7, self.answer8, self.answer11, self.answer12,
self.answer13, self.answer14, self.answer16, self.answer19, self.answer20,
self.answer22, self.answer23, self.answer24, self.answer25, self.answer26,
self.answer27, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer34, self.answer37, self.answer38, self.answer40,
self.answer41, self.answer42, self.answer43, self.answer45, s [...]
+ self.dialogue = [self.start, self.answer1, self.answer3,
self.answer4, self.answer7, self.answer8, self.answer11, self.answer12,
self.answer13, self.answer14, self.answer16, self.answer19, self.answer20,
self.answer22, self.answer23, self.answer24, self.answer25, self.answer26,
self.answer27, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer34, self.answer37, self.answer38, self.answer40,
self.answer41, self.answer42, self.answer43, self.answer45, s [...]
def clear (self):
del self.dialogue
@@ -93,7 +93,7 @@ class erek_start:
self.color = 0
self.npc.append (112)
- self.cont.append (71)
+ self.cont.append (72)
self.the_npc.set_val ("apologise" , 0)
self.player.append (-1)
@@ -103,25 +103,25 @@ class erek_start:
self.npc.append (113)
self.cont.append (-1)
self.player.append (115)
- self.cont.append (73)
+ self.cont.append (74)
self.player.append (-1)
def answer115 (self):
self.color = self.the_npc.get_color()
self.npc.append (114)
- self.cont.append (72)
+ self.cont.append (73)
self.player.append (-1)
def answer114 (self):
self.color = 0
self.npc.append (102)
- self.cont.append (65)
+ self.cont.append (66)
self.player.append (-1)
def answer102 (self):
self.color = 0
self.npc.append (103)
- self.cont.append (66)
+ self.cont.append (67)
self.player.append (-1)
def answer103 (self):
@@ -136,7 +136,7 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
self.player.append (105)
- self.cont.append (67)
+ self.cont.append (68)
self.player.append (-1)
def answer105 (self):
@@ -189,15 +189,21 @@ class erek_start:
def answer63 (self):
self.color = self.the_npc.get_color()
self.npc.append (64)
+ self.cont.append (44)
+ self.player.append (-1)
+
+ def answer64 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (120)
self.cont.append (-1)
self.player.append (65)
- self.cont.append (44)
+ self.cont.append (45)
self.player.append (-1)
def answer65 (self):
self.color = self.the_npc.get_color()
self.npc.append (66)
- self.cont.append (45)
+ self.cont.append (46)
self.player.append (-1)
def answer66 (self):
@@ -205,19 +211,19 @@ class erek_start:
self.npc.append (67)
self.cont.append (-1)
self.player.append (68)
- self.cont.append (46)
+ self.cont.append (47)
self.player.append (-1)
def answer68 (self):
self.color = self.the_npc.get_color()
self.npc.append (69)
- self.cont.append (47)
+ self.cont.append (48)
self.player.append (-1)
def answer69 (self):
self.color = self.the_npc.get_color()
self.npc.append (70)
- self.cont.append (48)
+ self.cont.append (49)
self.player.append (-1)
def answer70 (self):
@@ -273,19 +279,19 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1 and adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") >= 2:
self.player.append (116)
- self.cont.append (74)
+ self.cont.append (75)
if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
self.player.append (111)
- self.cont.append (70)
+ self.cont.append (71)
if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
self.player.append (81)
- self.cont.append (53)
+ self.cont.append (54)
if adonthell.gamedata_get_quest("demo").get_val
("ask_packed_gems") == 1:
self.player.append (91)
- self.cont.append (58)
+ self.cont.append (59)
if adonthell.gamedata_get_quest("demo").get_val
("know_bjarns_insult") == 1:
self.player.append (48)
@@ -295,13 +301,13 @@ class erek_start:
def answer48 (self):
self.color = self.the_npc.get_color()
self.npc.append (72)
- self.cont.append (49)
+ self.cont.append (50)
self.player.append (-1)
def answer72 (self):
self.color = self.the_npc.get_color()
self.npc.append (73)
- self.cont.append (50)
+ self.cont.append (51)
self.player.append (-1)
def answer73 (self):
@@ -315,7 +321,7 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
self.player.append (81)
- self.cont.append (53)
+ self.cont.append (54)
self.player.append (-1)
def answer75 (self):
@@ -326,7 +332,7 @@ class erek_start:
self.npc.append (92)
self.cont.append (-1)
self.player.append (93)
- self.cont.append (59)
+ self.cont.append (60)
self.player.append (-1)
def answer93 (self):
@@ -349,7 +355,7 @@ class erek_start:
self.player.append (84)
self.cont.append (-1)
self.player.append (85)
- self.cont.append (54)
+ self.cont.append (55)
self.player.append (-1)
def answer85 (self):
@@ -357,15 +363,15 @@ class erek_start:
self.npc.append (83)
self.cont.append (-1)
self.player.append (87)
- self.cont.append (56)
+ self.cont.append (57)
self.player.append (86)
- self.cont.append (55)
+ self.cont.append (56)
self.player.append (-1)
def answer86 (self):
self.color = self.the_npc.get_color()
self.npc.append (88)
- self.cont.append (57)
+ self.cont.append (58)
self.player.append (-1)
def answer88 (self):
@@ -383,7 +389,7 @@ class erek_start:
self.player.append (84)
self.cont.append (-1)
self.player.append (86)
- self.cont.append (55)
+ self.cont.append (56)
self.player.append (-1)
def answer84 (self):
@@ -394,21 +400,21 @@ class erek_start:
self.npc.append (98)
self.cont.append (-1)
self.player.append (99)
- self.cont.append (62)
- self.player.append (100)
self.cont.append (63)
+ self.player.append (100)
+ self.cont.append (64)
self.player.append (-1)
def answer100 (self):
self.color = self.the_npc.get_color()
self.npc.append (101)
- self.cont.append (64)
+ self.cont.append (65)
self.player.append (-1)
def answer101 (self):
self.color = 0
self.npc.append (102)
- self.cont.append (65)
+ self.cont.append (66)
self.player.append (-1)
def answer99 (self):
@@ -416,9 +422,9 @@ class erek_start:
self.npc.append (107)
self.cont.append (-1)
self.player.append (108)
- self.cont.append (68)
- self.player.append (109)
self.cont.append (69)
+ self.player.append (109)
+ self.cont.append (70)
self.player.append (-1)
def answer109 (self):
@@ -432,7 +438,7 @@ class erek_start:
def answer108 (self):
self.color = self.the_npc.get_color()
self.npc.append (101)
- self.cont.append (64)
+ self.cont.append (65)
self.player.append (-1)
def answer116 (self):
@@ -523,7 +529,7 @@ class erek_start:
self.player.append (76)
self.cont.append (-1)
self.player.append (77)
- self.cont.append (51)
+ self.cont.append (52)
self.player.append (-1)
def answer77 (self):
@@ -531,7 +537,7 @@ class erek_start:
self.npc.append (78)
self.cont.append (-1)
self.player.append (79)
- self.cont.append (52)
+ self.cont.append (53)
self.player.append (-1)
def answer79 (self):
@@ -543,7 +549,7 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
self.player.append (97)
- self.cont.append (61)
+ self.cont.append (62)
self.player.append (-1)
def answer97 (self):
@@ -551,9 +557,9 @@ class erek_start:
self.npc.append (98)
self.cont.append (-1)
self.player.append (99)
- self.cont.append (62)
- self.player.append (100)
self.cont.append (63)
+ self.player.append (100)
+ self.cont.append (64)
self.player.append (-1)
def answer33 (self):
@@ -573,7 +579,7 @@ class erek_start:
self.player.append (76)
self.cont.append (-1)
self.player.append (77)
- self.cont.append (51)
+ self.cont.append (52)
self.player.append (-1)
def answer71 (self):
@@ -632,7 +638,7 @@ class erek_start:
def answer20 (self):
self.color = self.the_npc.get_color()
self.npc.append (96)
- self.cont.append (60)
+ self.cont.append (61)
self.player.append (-1)
def answer96 (self):
@@ -679,7 +685,7 @@ class erek_start:
def answer23 (self):
self.color = self.the_npc.get_color()
self.npc.append (118)
- self.cont.append (75)
+ self.cont.append (76)
self.player.append (-1)
def answer118 (self):
- [adonthell-wastesedge-commits] Release_0-3-1 23c7a5b 120/237: FIXED wording, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 23c7a5b 120/237: FIXED wording, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 acd90d5 104/237: ADDED Tristan and Fellnir, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3bc0ac3 230/237: FIXED a little bug in Sarin's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c544301 203/237: Some fixes to some dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f47e582 148/237: FIXED start of new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b4a0e9c 073/237: Others furnitures added, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cdc0455 199/237: ADDED Ryan O'Neil to credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 12bc098 195/237: ADDED credits to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b770dc8 111/237: ADDED 'name your character' dialog that pops up when starting a new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5f31f05 215/237: Small fixes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c49550c 161/237: IMPROVED Erek slightly,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 f470b9c 198/237: CHANGED credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 06c1205 149/237: FIXED Python console, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 07b6477 176/237: ADDED more gameplay, hooray!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED stables to pantry, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8fca18 186/237: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa60e79 139/237: Building now creates byte-compiled script files, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the final mapcharacters., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bfb1042 180/237: IMPROVED chest-owners, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b239465 152/237: CHANGED scripts to new character handling, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a014b6 191/237: FIXES to the extro, Kai Sterker, 2016/07/25