[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 cdc0455 199/237: ADDED Ryan
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 cdc0455 199/237: ADDED Ryan O'Neil to credits |
Date: |
Mon, 25 Jul 2016 18:15:12 +0000 (UTC) |
tag: Release_0-3-1
commit cdc0455c0c44d80918c4213a10fd8b187b562bd8
Author: adondev <adondev>
Commit: adondev <adondev>
ADDED Ryan O'Neil to credits
---
scripts/schedules/mapcharacters/extro.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/scripts/schedules/mapcharacters/extro.py
b/scripts/schedules/mapcharacters/extro.py
index cb7d9bb..c70f142 100644
--- a/scripts/schedules/mapcharacters/extro.py
+++ b/scripts/schedules/mapcharacters/extro.py
@@ -17,9 +17,6 @@ import events
class extro:
def __init__(self, mapchar):
- # -- deactivate game controls
- adonthell.gamedata_engine ().set_control_active (0)
-
# -- grab the character's we need
bjarn = adonthell.gamedata_get_character ("Bjarn Fingolson")
erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
@@ -143,14 +140,14 @@ class extro:
("John Havard", 1), \
("James Nash", 3), \
("soundtrack available on:", 1), \
- ("http://www.zhaytee.com/...", 5), \
+ ("http://www.zhaytee.com/...", 3), \
("the Adonthell team whishes to thank:", 2), \
("Al Koskelin", 1), \
("Andrew Henderson", 1), \
("Chris Harris", 1), \
("Mark Howson", 1), \
("Dave Peticolas", 1), \
- ("Josh's friend doing the CVS", 1), \
+ ("Ryan O'Neil", 1), \
("Meandus", 1), \
("Deniz Oezsen", 2), \
("The people behind SDL, Ogg Vorbis,", 1), \
@@ -170,7 +167,7 @@ class extro:
self.colors = ["white", "yellow", "red", "violet", "blue", "green"]
# -- misc stuff
- self.index = 34
+ self.index = 0
self.bubble = self.make_bubble ()
self.done = 0
@@ -204,8 +201,12 @@ class extro:
def run (self):
+ # -- deactivate game controls
+ if self.index == 0:
+ adonthell.gamedata_engine ().set_control_active (0)
+
# -- Bjarn walks up to chest
- if self.index == 18:
+ elif self.index == 18:
bjarn = self.text[2][0]
if self.done == 0:
bjarn.set_schedule_active (0)
@@ -516,7 +517,7 @@ class extro:
# -- misc stuff
self.step = 0 # -- for the extro control
self.anim = 0 # -- for the forest animation control
- self.index = 3 # -- index in the typeover array
+ self.index = 0 # -- index in the typeover array
self.delay = 0 # -- delay before adding new text
self.cursor = 0 # -- cursor in the typeover text
self.x = [0, 0, 0] # -- offsets of the 3 forest pics
- [adonthell-wastesedge-commits] Release_0-3-1 dcb7646 212/237: Continued veranda, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 dcb7646 212/237: Continued veranda, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 919bce7 162/237: ADDED a few 'gimmicks' :), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 11da725 225/237: FIXED slight bug in Talan's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 219b786 155/237: UPDATED font colors a little, Kai Sterker, 2016/07/25
- [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 <=
- [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, 2016/07/25
- [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