[adonthell-wastesedge-commits] Release_0-3-1 ae421bc 146/237: Python scripts files are now compiled by the Adonthell binary.

[Kai Sterker]

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

    Python scripts files are now compiled by the Adonthell binary.
    ADDED new intro/menu music and removed old one.
---
 audio/Makefile.am                           |    3 ++-
 audio/at-demo-1.ogg                         |  Bin 0 -> 202746 bytes
 audio/at-demo-2.ogg                         |  Bin 0 -> 1196653 bytes
 audio/at-demo-3.ogg                         |  Bin 0 -> 614345 bytes
 audio/at-demo-4.ogg                         |  Bin 0 -> 724050 bytes
 audio/at-menu-full.ogg                      |  Bin 1452090 -> 0 bytes
 scripts/Makefile.am                         |    6 +++---
 scripts/actions/Makefile.am                 |    6 +++---
 scripts/dialogues/Makefile.am               |    6 +++---
 scripts/events/Makefile.am                  |    6 +++---
 scripts/init.py                             |    7 ++++---
 scripts/modules/Makefile.am                 |    6 +++---
 scripts/modules/intro.py                    |   12 ++++++++++++
 scripts/schedules/mapcharacters/Makefile.am |    6 +++---
 scripts/schedules/mapviews/Makefile.am      |    6 +++---
 15 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/audio/Makefile.am b/audio/Makefile.am
index e93379b..b3f1a0f 100755
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -1,5 +1,6 @@
 pkgdatadir = $(gamedatadir)/audio
 
-pkgdata_DATA = at-menu-full.ogg select.wav switch.wav
+pkgdata_DATA = at-demo-1.ogg at-demo-2.ogg at-demo-3.ogg at-demo-4.ogg \
+       select.wav switch.wav
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/audio/at-demo-1.ogg b/audio/at-demo-1.ogg
new file mode 100644
index 0000000..db3fc30
Binary files /dev/null and b/audio/at-demo-1.ogg differ
diff --git a/audio/at-demo-2.ogg b/audio/at-demo-2.ogg
new file mode 100644
index 0000000..1268713
Binary files /dev/null and b/audio/at-demo-2.ogg differ
diff --git a/audio/at-demo-3.ogg b/audio/at-demo-3.ogg
new file mode 100644
index 0000000..83517b0
Binary files /dev/null and b/audio/at-demo-3.ogg differ
diff --git a/audio/at-demo-4.ogg b/audio/at-demo-4.ogg
new file mode 100644
index 0000000..9aa7150
Binary files /dev/null and b/audio/at-demo-4.ogg differ
diff --git a/audio/at-menu-full.ogg b/audio/at-menu-full.ogg
deleted file mode 100755
index c6581f8..0000000
Binary files a/audio/at-menu-full.ogg and /dev/null differ
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ca3284d..c31b694 100755
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -6,10 +6,10 @@ pkgdata_DATA = *.pyc
 
 EXTRA_DIST = init.py
 
-all: *.pyc
+all:
+       $(adonthell_binary) -c
 
 *.pyc: *.py
-       python -c 'import compileall; compileall.compile_dir (".", 0);'
 
 clean:
-       rm *.pyc
+       rm -f *.pyc
diff --git a/scripts/actions/Makefile.am b/scripts/actions/Makefile.am
index 735c06a..2d85f7f 100755
--- a/scripts/actions/Makefile.am
+++ b/scripts/actions/Makefile.am
@@ -4,10 +4,10 @@ pkgdata_DATA = *.pyc
 
 EXTRA_DIST = talk.py
 
-all: *.pyc
+all:
+       $(adonthell_binary) -c
 
 *.pyc: *.py
-       python -c 'import compileall; compileall.compile_dir (".", 0);'
 
 clean:
-       rm *.pyc
+       rm -f *.pyc
diff --git a/scripts/dialogues/Makefile.am b/scripts/dialogues/Makefile.am
index 0c728c2..f45f127 100755
--- a/scripts/dialogues/Makefile.am
+++ b/scripts/dialogues/Makefile.am
@@ -7,10 +7,10 @@ EXTRA_DIST = orloth_start.py lucia_start.py sarin_start.py \
     frostbloom_start.py talan_start.py alek_start.py jelom_start.py \
     tristan_start.py jelom_2nd.py demo_intro_1.py
 
-all: *.pyc
+all:
+       $(adonthell_binary) -c
 
 *.pyc: *.py
-       python -c 'import compileall; compileall.compile_dir (".", 0);'
 
 clean:
-       rm *.pyc
+       rm -f *.pyc
diff --git a/scripts/events/Makefile.am b/scripts/events/Makefile.am
index 88418ce..8f0ecd6 100755
--- a/scripts/events/Makefile.am
+++ b/scripts/events/Makefile.am
@@ -5,10 +5,10 @@ pkgdata_DATA = *.pyc
 EXTRA_DIST = teleport.py cellar_to_bjarn.py fst_to_silverhair.py \
        character_speak.py open_inn_door.py
 
-all: *.pyc
+all:
+       $(adonthell_binary) -c
 
 *.pyc: *.py
-       python -c 'import compileall; compileall.compile_dir (".", 0);'
 
 clean:
-       rm *.pyc
+       rm -f *.pyc
diff --git a/scripts/init.py b/scripts/init.py
index b85b546..3a111cc 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -20,8 +20,7 @@ import time
 class title_screen:
     def __init__ (self):
         # -- load our music
-        audio_load_background (0, "audio/at-menu-full.ogg")
-        audio_load_background (1, "audio/at-dummy-1.ogg")
+        audio_load_background (0, "audio/at-demo-1.ogg")
         audio_load_wave (0, "audio/select.wav")
         audio_load_wave (1, "audio/switch.wav")
         audio_load_wave (2, "audio/unselect.wav")
@@ -170,6 +169,8 @@ class title_screen:
 
     # -- on to the main menu
     def on_menu_close (self, retval):
+        audio_pause_music ()
+        audio_unload_background (0)
         if retval < 5:
             gamedata_map_engine ().set_should_update_map (1)
 
@@ -211,6 +212,7 @@ class title_screen:
 
         self.retval = 0
         audio_pause_music ()
+        audio_unload_background (0)
 
         screen_display.fillrect (0, 0, 320, 240, 0)
         screen_show ()
@@ -1018,7 +1020,6 @@ class title_screen:
         # just call gamedata::save (1) and copy the .data files
         # to the game's root directory.
 
-        audio_play_background (1)
         gametime_update ()
         gamedata_map_engine ().fade_in ()
 
diff --git a/scripts/modules/Makefile.am b/scripts/modules/Makefile.am
index a33f564..d4b549f 100755
--- a/scripts/modules/Makefile.am
+++ b/scripts/modules/Makefile.am
@@ -4,10 +4,10 @@ pkgdata_DATA = *.pyc
 
 EXTRA_DIST = console.py main_menu.py events.py character_screen.py intro.py
 
-all: *.pyc
+all:
+       $(adonthell_binary) -c
 
 *.pyc: *.py
-       python -c 'import compileall; compileall.compile_dir (".", 0);'
 
 clean:
-       rm *.pyc
+       rm -f *.pyc
diff --git a/scripts/modules/intro.py b/scripts/modules/intro.py
index 62283cc..b56e107 100644
--- a/scripts/modules/intro.py
+++ b/scripts/modules/intro.py
@@ -109,6 +109,11 @@ need not be here.", "red", 25, 5, 400, 0),
            ("Trouble?  Why then, I must get inside.  My employer will need me 
close at \
 hand!", "yellow", 130, 15, 500, 0))
 
+# The audio
+audio_load_background (0, "audio/at-demo-2.ogg");
+audio_load_background (1, "audio/at-demo-3.ogg");
+audio_load_background (2, "audio/at-demo-4.ogg");
+
 wintextocc = 0
 wincpt = 0
 windelay = 0
@@ -121,6 +126,7 @@ letsexit = 0
 screen_clear ()
 
 gametime_start_action ()
+audio_play_background (0)
 
 while not input_has_been_pushed (SDLK_ESCAPE) and not input_has_been_pushed 
(SDLK_SPACE) and not letsexit:
     # Update the stuff
@@ -168,6 +174,7 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
             else:
                 # Switch to close inn view?
                 if windelay == -300:
+                    audio_play_background (2)
                     status = 4
                     windelay = 0
                     wintextocc = 0
@@ -188,6 +195,7 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
                     if bg.alpha () == 150:
                         # Start scrolling
                         status = 2
+                        audio_play_background (1)
 
             if status == 2:
                 if bgy < bg.height () - screen_height ():
@@ -233,5 +241,9 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
     screen_show ()
     gametime_update ()
 
+audio_unload_background (0)
+audio_unload_background (1)
+audio_unload_background (2)
+
 # Avoid a bad crash...
 cont.remove (lab)
diff --git a/scripts/schedules/mapcharacters/Makefile.am 
b/scripts/schedules/mapcharacters/Makefile.am
index 8f0683e..e35de75 100644
--- a/scripts/schedules/mapcharacters/Makefile.am
+++ b/scripts/schedules/mapcharacters/Makefile.am
@@ -6,10 +6,10 @@ EXTRA_DIST = alek.py erek.py frostbloom.py janesta.py 
jelom.py \
        keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
        talan.py tristan.py fellnir.py to_cellar.py lucia.py intro.py
 
-all: *.pyc
+all:
+       $(adonthell_binary) -c
 
 *.pyc: *.py
-       python -c 'import compileall; compileall.compile_dir (".", 0);'
 
 clean:
-       rm *.pyc
+       rm -f *.pyc
diff --git a/scripts/schedules/mapviews/Makefile.am 
b/scripts/schedules/mapviews/Makefile.am
index 9850975..608f5cc 100644
--- a/scripts/schedules/mapviews/Makefile.am
+++ b/scripts/schedules/mapviews/Makefile.am
@@ -4,10 +4,10 @@ pkgdata_DATA = *.pyc
 
 EXTRA_DIST = center_character.py
 
-all: *.pyc
+all:
+       $(adonthell_binary) -c
 
 *.pyc: *.py
-       python -c 'import compileall; compileall.compile_dir (".", 0);'
 
 clean:
-       rm *.pyc
+       rm -f *.pyc