From 6133a45210126a3eeb435fb50660d523126b91fa Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Thu, 5 Jun 2014 20:53:37 +0100
Subject: [PATCH] [Add] Use landing_sinister when landing on Eiroik for
missions.
---
dat/missions/empire/collective/ec02.lua | 5 +++++
dat/missions/empire/collective/ec04.lua | 5 +++++
src/land.c | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dat/missions/empire/collective/ec02.lua b/dat/missions/empire/collective/ec02.lua
index 344cd49..6555d59 100644
--- a/dat/missions/empire/collective/ec02.lua
+++ b/dat/missions/empire/collective/ec02.lua
@@ -55,6 +55,11 @@ function land()
-- First mission part is landing on the planet.
if misn_stage == 0 and planet == misn_target then
+ -- Sinister music landing.
+ music.load("landing_sinister")
+ music.play()
+
+ -- Some text.
tk.msg(title[1], string.format(text[4], misn_target:name()))
misn_stage = 1
misn.setDesc(string.format(misn_desc[1], misn_base:name(), misn_base_sys:name()))
diff --git a/dat/missions/empire/collective/ec04.lua b/dat/missions/empire/collective/ec04.lua
index 6c40af5..a4eb059 100644
--- a/dat/missions/empire/collective/ec04.lua
+++ b/dat/missions/empire/collective/ec04.lua
@@ -75,6 +75,11 @@ function land()
-- Just landing.
if misn_stage == 0 and planet == misn_target then
+ -- Sinister music landing.
+ music.load("landing_sinister")
+ music.play()
+
+ -- Some flavour text.
tk.msg(title[2], text[3])
misn_stage = 1
misn.setDesc(string.format(misn_desc[2], misn_base:name(), misn_base_sys:name()))
diff --git a/src/land.c b/src/land.c
index 3ac27db..3a725d1 100644
--- a/src/land.c
+++ b/src/land.c
@@ -1409,7 +1409,7 @@ void land(Planet* p) {
/* Change the music. */
music_choose("land");
- /* Run hooks. */
+ /* Run hooks, run after music in case hook wants to change music. */
hooks_run("land");
/* Generate mission computer stuff. */