[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 dc927e9 184/237: FIXED some
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 dc927e9 184/237: FIXED some problems with the extro |
Date: |
Mon, 25 Jul 2016 18:15:10 +0000 (UTC) |
tag: Release_0-3-1
commit dc927e9a141053f45adc8ad3919047369311b9bc
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED some problems with the extro
---
scripts/schedules/mapcharacters/extro.py | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/scripts/schedules/mapcharacters/extro.py
b/scripts/schedules/mapcharacters/extro.py
index f163df3..8f9fa44 100644
--- a/scripts/schedules/mapcharacters/extro.py
+++ b/scripts/schedules/mapcharacters/extro.py
@@ -32,7 +32,7 @@ class extro:
(bjarn, 1, "Why? Haven't I made myself clear already?"), \
(bjarn, 1, "I despise those Elves and their uncanny ways."), \
(bjarn, 1, "Their ... meddling with reality contradicts all
principles I learned to hold true."), \
- (bjarn, 1, "And yet, I had to provide them with the reagents they
needed to perform their dark art."), \
+ (bjarn, 1, "And yet, I had to provide them with the reagents they
need to perform their dark art."), \
(bjarn, 1, "I felt so ... ashamed!"), \
(player, 1, "And you believe that justifies the discomfort you
caused my mistress?"), \
(bjarn, 1, "You cannot think further than your mistress, can
you?"), \
@@ -125,14 +125,16 @@ class extro:
# -- Talan bursts in
elif self.index == 23 and self.done == 0:
+ self.bubble = None
bjarn = self.text[2][0]
bjarn.go_south ()
bjarn.load ('bjarn_crying.mchar')
import events
talan = adonthell.gamedata_get_character ('Talan Wendth')
- events.switch_submap (talan, 7, 1, 7, adonthell.STAND_EAST)
+ events.switch_submap (talan, 7, 1, 6, adonthell.STAND_EAST)
talan.go_east ()
+ talan.stand_south ()
self.done = 1
elif self.index == 34 and self.bubble == None:
@@ -354,8 +356,8 @@ class extro:
elif self.step == 801:
self.done = 0
- adonthell.gamedata_player ().set_schedule_active (1)
adonthell.gamedata_engine ().main_quit ()
+ adonthell.gamedata_player ().set_schedule_active (1)
# -- forest sequence
def fade_to_forest (self):
@@ -417,7 +419,6 @@ class extro:
# -- misc stuff
self.step = 0 # -- for the extro control
self.anim = 0 # -- for the forest animation control
- # self.done = 1
self.index = 0 # -- index in the typeover array
self.delay = 0 # -- delay before adding new text
self.cursor = 0 # -- cursor in the typeover text
@@ -431,7 +432,7 @@ class extro:
self.anim = self.anim + 1
if self.anim % 2 == 0:
update = 1
- self.x[0] = self.update_wood (self.wood1, self.x[0])
+ self.x[2] = self.update_wood (self.wood3, self.x[2])
if self.anim % 3 == 0:
update = 1
@@ -439,8 +440,7 @@ class extro:
if self.anim % 4 == 0:
update = 1
- self.x[1] = self.update_wood (self.wood2, self.x[1])
- self.x[2] = self.update_wood (self.wood3, self.x[2])
+ self.x[0] = self.update_wood (self.wood1, self.x[0])
# -- draw
if update == 1:
@@ -466,13 +466,17 @@ class extro:
if self.delay >= 10:
if self.cursor == 0: self.label.set_text ("")
- self.label.add_text
(self.typeover[self.index][self.cursor])
+ txt = self.typeover[self.index][self.cursor]
+ self.label.add_text (txt)
self.cursor = self.cursor + 1
- self.delay = 0
+
+ # -- little pause at the end of a sentence
+ if txt == '.': self.delay = -50
+ else: self.delay = 0
else:
self.index = self.index + 1
self.cursor = 0
- self.delay = -500
+ self.delay = -450
else:
self.delay = 0
self.step = 2
- [adonthell-wastesedge-commits] Release_0-3-1 140e4c2 172/237: Deactivated the 'Options' option, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 140e4c2 172/237: Deactivated the 'Options' option, Kai Sterker, 2016/07/25
- [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 <=
- [adonthell-wastesedge-commits] Release_0-3-1 8d71e77 171/237: FINISHED extro dialogue, Kai Sterker, 2016/07/25
- [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