[adonthell-wastesedge-commits] Release_0-3-1 e74fdec 226/237: ADDED music to the extro

[Kai Sterker]

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

    ADDED music to the extro
    UPDATED Silverhair's speech in Erek's dialogue to better match her 
personality
    UPDATED Key Controls in PLAYING file
---
 PLAYING                                  |   26 ++++++------
 configure.in                             |    2 +-
 scripts/dialogues/erek_start.py          |   63 ++++++++++++++----------------
 scripts/schedules/audio/Makefile.am      |    2 +-
 scripts/schedules/audio/extro.py         |   35 +++++++++++++++++
 scripts/schedules/mapcharacters/extro.py |   28 +++++++++++--
 6 files changed, 105 insertions(+), 51 deletions(-)

diff --git a/PLAYING b/PLAYING
index 439f9e5..f1065e7 100644
--- a/PLAYING
+++ b/PLAYING
@@ -26,20 +26,24 @@ it the first time you play :P
 Controls
 ========
 
-Arrow keys:         - Choosing options in the game menus
-                    - Moving you chracter around the map
-                    - Choosing responses during dialoges
+Arrow keys:     - Choosing options in the game menus
+                - Moving you chracter around the map
+                - Choosing responses during dialoges
 
-Enter/Space keys:      - Selecting an option in the game menus
-                    - Talking to a character (when you are facing them)
-                               - Selecting a response during dialogues
-                               - Examining items in and round the inn (only 
works
-                                 in some places!)
+Space:         - Selecting an option in the game menus
+                - Talking to a character (when you are facing them)
+                           - Selecting a response during dialogues
+                           - Examining items in and round the inn (only works
+                             in some places!)
 
-Page Up/Down:       - Scrolling up/down in dialogues
+Enter:         - Selecting an option in the game menus
+                           - Selecting a response during dialogues
 
-Escape              - Skipping cutscenes (like the intro)
-                    - Bringing up the game menu
+Page Up/Down:   - Scrolling up/down in dialogues
+
+Escape          - Skipping cutscenes (like the intro)
+                - Bringing up the game menu
+                - Closing (some) windows
 
 (there are also one or two other 'cheat' controls - but we
 never told you that! :P)
diff --git a/configure.in b/configure.in
index b73ee11..f1c89a9 100755
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl 
**************************************************************
 
 AC_INIT(README)
 
-AM_INIT_AUTOMAKE(wastesedge, 0.3pre1)
+AM_INIT_AUTOMAKE(wastesedge, 0.3)
 
 dnl Checking for Adonthell
 AC_PATH_PROG(adonthell_binary, adonthell)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 3e23fb6..7814cae 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
@@ -22,32 +22,32 @@ class erek_start:
        def clear (self):
                del self.dialogue
 
-       # Returns whom the Player told about his connection
-       # with Lady Silverhair
-       def get_right_npc (self):
-           if adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") & 
1 == 1:
-               return "Master Orloth"
-       
-           elif adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") 
& 2 == 2:
-               return "the mercenary"
-       
-           else:
-               return "Tristan the merchant"
-       
-       # -- 'teleport' to Bjarn's room
-       def __del__ (self):
-           if adonthell.gamedata_get_quest("demo").get_val ("bjarn_door_open") 
== 2:
-               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
-               from events import switch_submap
-               erek.set_val ("goto", erek.submap ())
-               switch_submap (self.the_player, 7, 1, 6, 3)
-               switch_submap (erek, 7, 2, 7, 0)
-       
-           if adonthell.gamedata_get_quest("demo").get_val ("convince_jelom") 
== 2:
-               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
-               erek.set_schedule_active (0)
-               from events import switch_submap
-               switch_submap (self.the_player, 9, 1, 3, 3)
+       # Returns whom the Player told about his connection
+       # with Lady Silverhair
+       def get_right_npc (self):
+           if adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") & 
1 == 1:
+               return "Master Orloth"
+       
+           elif adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") 
& 2 == 2:
+               return "the mercenary"
+       
+           else:
+               return "Tristan the merchant"
+       
+       # -- 'teleport' to Bjarn's room
+       def __del__ (self):
+           if adonthell.gamedata_get_quest("demo").get_val ("bjarn_door_open") 
== 2:
+               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
+               from events import switch_submap
+               erek.set_val ("goto", erek.submap ())
+               switch_submap (self.the_player, 7, 1, 6, 3)
+               switch_submap (erek, 7, 2, 7, 0)
+       
+           if adonthell.gamedata_get_quest("demo").get_val ("convince_jelom") 
== 2:
+               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
+               erek.set_schedule_active (0)
+               from events import switch_submap
+               switch_submap (self.the_player, 9, 1, 3, 3)
                switch_submap (erek, 9, 2, 4, 0)
 
 
@@ -259,7 +259,7 @@ class erek_start:
                self.color = self.the_npc.get_color()
                self.npc.append (104)
                self.cont.append (-1)
-               if adonthell.gamedata_get_quest("demo").get_val 
("gem_worthless") < 2:
+               if adonthell.gamedata_get_quest("demo").get_val 
("gem_worthless") < 2:
                    adonthell.gamedata_get_quest("demo").set_val 
("gem_worthless" , adonthell.gamedata_get_quest("demo").get_val 
("gem_worthless") + 2)
 
                self.player.append (106)
@@ -324,8 +324,6 @@ class erek_start:
                self.color = adonthell.gamedata_get_character("Imoen 
Silverhair").get_color()
                self.npc.append (24)
                self.cont.append (15)
-               adonthell.gamedata_get_quest("demo").set_val ("know_argument" , 
1)
-
                self.player.append (-1)
 
        def answer24 (self):
@@ -341,6 +339,7 @@ class erek_start:
                self.npc.append (26)
                self.cont.append (17)
                adonthell.gamedata_get_quest("demo").set_val 
("know_low_quality" , 1)
+               adonthell.gamedata_get_quest("demo").set_val ("know_argument" , 
1)
 
                self.player.append (-1)
 
@@ -672,8 +671,6 @@ class erek_start:
                self.color = adonthell.gamedata_get_character("Imoen 
Silverhair").get_color()
                self.npc.append (24)
                self.cont.append (15)
-               adonthell.gamedata_get_quest("demo").set_val ("know_argument" , 
1)
-
                self.player.append (-1)
 
        def answer22 (self):
@@ -699,8 +696,6 @@ class erek_start:
                self.color = adonthell.gamedata_get_character("Imoen 
Silverhair").get_color()
                self.npc.append (24)
                self.cont.append (15)
-               adonthell.gamedata_get_quest("demo").set_val ("know_argument" , 
1)
-
                self.player.append (-1)
 
        def answer13 (self):
diff --git a/scripts/schedules/audio/Makefile.am 
b/scripts/schedules/audio/Makefile.am
index d6b598b..01a1d17 100644
--- a/scripts/schedules/audio/Makefile.am
+++ b/scripts/schedules/audio/Makefile.am
@@ -2,7 +2,7 @@ pkgdatadir = $(gamedatadir)/scripts/schedules/audio
 
 pkgdata_DATA = *.pyc
 
-EXTRA_DIST = in_game.py
+EXTRA_DIST = in_game.py extro.py
 
 all:
        $(adonthell_binary) -c
diff --git a/scripts/schedules/audio/extro.py b/scripts/schedules/audio/extro.py
new file mode 100644
index 0000000..d554dc4
--- /dev/null
+++ b/scripts/schedules/audio/extro.py
@@ -0,0 +1,35 @@
+#
+#  $Id$
+#
+#  (C) Copyright 2002 Kai Sterker <address@hidden>
+#  Part of the Adonthell Project http://adonthell.linuxgames.com
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License.
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY.
+#
+#  See the COPYING file for more details
+#
+
+# -- Schedule for the in game music
+
+import adonthell
+
+class extro:
+    def __init__ (self):
+        adonthell.gamedata_get_quest ("demo").set_val ("music", 0)
+
+    # -- method called everytime a song has finished playing
+    #    load song before playing, as the mixer seems to discard it
+    #    after it's been played once
+    def music_finished (self, song):
+        music = adonthell.gamedata_get_quest ("demo").get_val ("music")
+        
+        if music == 0:
+            adonthell.audio_load_background (0, "audio/at-demo-9.ogg")
+            adonthell.audio_play_background (0)
+            
+        else:
+            adonthell.audio_load_background (2, "audio/at-demo-2.ogg")
+            adonthell.audio_play_background (2)
diff --git a/scripts/schedules/mapcharacters/extro.py 
b/scripts/schedules/mapcharacters/extro.py
index c4ffb5a..79244d3 100644
--- a/scripts/schedules/mapcharacters/extro.py
+++ b/scripts/schedules/mapcharacters/extro.py
@@ -17,6 +17,9 @@ import events
 
 class extro:
     def __init__(self, mapchar):
+        # -- audio
+        adonthell.audio_fade_out_background (1000)
+        
         # -- grab the character's we need
         bjarn = adonthell.gamedata_get_character ("Bjarn Fingolson")
         erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
@@ -143,7 +146,7 @@ class extro:
             ("James Nash", 2), \
             ("soundtrack available on:", 1), \
             ("http://zhaymusic.com/wastesedge/";, 5), \
-            ("the Adonthell team whishes to thank:", 2), \
+            ("the Adonthell team wishes to thank:", 2), \
             ("Al Koskelin", 1), \
             ("Andrew Henderson", 1), \
             ("Chris Harris", 1), \
@@ -157,7 +160,7 @@ class extro:
             ("Software developers whose work", 1), \
             ("made Adonthell possible", 3), \
             ("career portal:", 1), \
-            ("http://adonthell.linuxgames.com/development/";, 3), \
+            ("http://adonthell.linuxgames.com/development/";, 5), \
             ("No Yetis were harmed during\n the production of this game", 5), \
             ("presented in", 2), \
             ("Ogg Vorbis Stereo", 1), \
@@ -201,7 +204,12 @@ class extro:
         self.bjarn.pack ()
         self.bjarn.thisown = 0
 
-
+        # -- set new audio schedule and play extro music
+        adonthell.audio_load_background (0, "audio/at-demo-9.ogg")
+        adonthell.audio_play_background (0)
+        adonthell.audio_set_schedule ("extro")
+    
+    
     def run (self):
         # -- deactivate game controls
         if self.index == 0:
@@ -435,6 +443,10 @@ class extro:
 
         # -- zoom to bjarn's face        
         elif self.step == 601:
+            # -- audio
+            adonthell.audio_load_background (1, "audio/at-demo-a.ogg")
+            adonthell.audio_play_background (1)
+            
             self.bjarn.set_visible (1)
             self.window.add (self.bjarn)
             self.window.remove (self.c_bag)
@@ -527,6 +539,12 @@ class extro:
         
         self.draw_func = self.forest_animation
         
+        # -- audio
+        adonthell.audio_fade_out_background (500)
+        adonthell.gamedata_get_quest ("demo").set_val ("music", 1)
+        adonthell.audio_load_background (2, "audio/at-demo-2.ogg")
+        adonthell.audio_play_background (2)
+        
         # -- misc stuff
         self.step = 0       # -- for the extro control
         self.anim = 0       # -- for the forest animation control
@@ -601,6 +619,9 @@ class extro:
         elif self.step == 2:
             self.delay = self.delay + 1
             if self.delay == 350:
+                  # -- audio
+                  adonthell.audio_set_schedule_active (0)
+                  adonthell.audio_fade_out_background (2000)
                   self.window.add (self.black)
                   self.step = 3
         
@@ -631,7 +652,6 @@ class extro:
     # -- prepare credits
     def make_credits (self):
         # -- audio
-        adonthell.audio_fade_out_background (500)
         adonthell.audio_load_background (0, "audio/at-demo-8.ogg")
         adonthell.audio_play_background (0)