[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 febb1af 187/237: ADDED in-g
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 febb1af 187/237: ADDED in-game music! |
Date: |
Mon, 25 Jul 2016 18:15:11 +0000 (UTC) |
tag: Release_0-3-1
commit febb1afefb5530e5ad78482f9976a9d72dc82e27
Author: adondev <adondev>
Commit: adondev <adondev>
ADDED in-game music!
---
scripts/schedules/audio/in_game.py | 12 ++++++++----
scripts/schedules/mapcharacters/intro.py | 3 +--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/scripts/schedules/audio/in_game.py
b/scripts/schedules/audio/in_game.py
index cb2778f..0c3aafd 100644
--- a/scripts/schedules/audio/in_game.py
+++ b/scripts/schedules/audio/in_game.py
@@ -18,12 +18,16 @@ import adonthell
class in_game:
def __init__ (self):
- self.playing = adonthell.audio_get_current_background ()
-
+ pass
+
+ # -- 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):
if song == 0:
+ adonthell.audio_load_background (1, "audio/at-demo-6.ogg")
adonthell.audio_play_background (1)
- self.playing = 1
else:
+ adonthell.audio_load_background (0, "audio/at-demo-5.ogg")
adonthell.audio_play_background (0)
- self.playing = 0
+
diff --git a/scripts/schedules/mapcharacters/intro.py
b/scripts/schedules/mapcharacters/intro.py
index 7cd468f..6da7791 100644
--- a/scripts/schedules/mapcharacters/intro.py
+++ b/scripts/schedules/mapcharacters/intro.py
@@ -40,10 +40,9 @@ class intro:
# -- start music
adonthell.audio_load_background (0, "audio/at-demo-5.ogg")
- adonthell.audio_load_background (1, "audio/at-demo-6.ogg")
+ adonthell.audio_play_background (0)
adonthell.audio_set_schedule ("in_game")
adonthell.audio_set_schedule_active (1)
- adonthell.audio_play_background (0)
self.open_gate ()
- [adonthell-wastesedge-commits] Release_0-3-1 8fdfd66 165/237: Added Barn interior, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 8fdfd66 165/237: Added Barn interior, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 48053be 090/237: Updated the init script, so you can skip the title sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 547a59d 130/237: FIXED the mess I made ; P, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b1a1e7a 154/237: ADDED extro dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c31d284 145/237: MOVED fading code to mapengine, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 78eb33a 147/237: UPDATED scripts to make use of the new win_manager features, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 22057de 206/237: ADDED new music, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fb80ca7 128/237: Corrected a problem with the name., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8054ed1 175/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 39a6545 170/237: Fixed gate and added Kitchen's furnitures, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 febb1af 187/237: ADDED in-game music!,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 88aa49d 067/237: Fixed Oliver's teleportation bug., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 558cf65 088/237: Fixed the mess I made yesterday. Sorry., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0924f07 144/237: ADDED final part to Bjarn's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c20844e 118/237: UPDATED Erek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e7e6e03 121/237: ADDED script to get all character's to Bjarn's room, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d62b800 105/237: FIXED bug in Talan's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 16bc2fa 181/237: Added Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b2cc71d 135/237: Schregneugneu., Kai Sterker, 2016/07/25
- [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