From 4f22f63f8650d0526c7b5583b5b3aca0f0f12ebc Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Mon, 19 May 2014 18:29:59 +0100
Subject: [PATCH] [Change] Bring a little order to the missions.
---
dat/mission.xml | 22 +++++++++----------
.../collective/ec00.lua} | 0
.../collective/ec01.lua} | 0
.../collective/ec02.lua} | 0
.../collective/ec03.lua} | 0
.../collective/ec04.lua} | 0
.../collective/ec05.lua} | 0
.../collective/ec06.lua} | 0
dat/missions/{ => empire}/emp_cargo00.lua | 0
dat/missions/{ => empire}/es_cargo.lua | 0
dat/missions/{ => neutral}/cargo.lua | 0
dat/missions/{ => neutral}/nebu_satellite.lua | 0
scripts/ai/tpl/merchant.lua | 2 +-
src/lluadef.h | 2 +-
14 files changed, 13 insertions(+), 13 deletions(-)
rename dat/missions/{emp_collective00.lua => empire/collective/ec00.lua} (100%)
rename dat/missions/{emp_collective01.lua => empire/collective/ec01.lua} (100%)
rename dat/missions/{emp_collective02.lua => empire/collective/ec02.lua} (100%)
rename dat/missions/{emp_collective03.lua => empire/collective/ec03.lua} (100%)
rename dat/missions/{emp_collective04.lua => empire/collective/ec04.lua} (100%)
rename dat/missions/{emp_collective05.lua => empire/collective/ec05.lua} (100%)
rename dat/missions/{emp_collective06.lua => empire/collective/ec06.lua} (100%)
rename dat/missions/{ => empire}/emp_cargo00.lua (100%)
rename dat/missions/{ => empire}/es_cargo.lua (100%)
rename dat/missions/{ => neutral}/cargo.lua (100%)
rename dat/missions/{ => neutral}/nebu_satellite.lua (100%)
diff --git a/dat/mission.xml b/dat/mission.xml
index 51a1229..9f55ad7 100644
--- a/dat/mission.xml
+++ b/dat/mission.xml
@@ -10,7 +10,7 @@
</avail>
</mission>
<mission name="Cargo">
- <lua>cargo</lua>
+ <lua>neutral/cargo</lua>
<avail>
<chance>960</chance>
<location>Computer</location>
@@ -22,7 +22,7 @@
</avail>
</mission>
<mission name="Empire Recruitment">
- <lua>emp_cargo00</lua>
+ <lua>empire/emp_cargo00</lua>
<flags>
<unique>1</unique>
</flags>
@@ -33,7 +33,7 @@
</avail>
</mission>
<mission name="Empire Shipping">
- <lua>es_cargo</lua>
+ <lua>empire/es_cargo</lua>
<avail>
<cond>player.getFaction("Empire") >= 0 and var.peek("es_cargo") == true</cond>
<chance>350</chance>
@@ -43,7 +43,7 @@
</avail>
</mission>
<mission name="Collective Scouting">
- <lua>emp_collective00</lua>
+ <lua>empire/collective/ec00</lua>
<flags>
<unique>1</unique>
</flags>
@@ -55,7 +55,7 @@
</avail>
</mission>
<mission name="Collective Espionage 1">
- <lua>emp_collective01</lua>
+ <lua>empire/collective/ec01</lua>
<flags>
<unique>1</unique>
</flags>
@@ -68,7 +68,7 @@
</avail>
</mission>
<mission name="Collective Espionage 2">
- <lua>emp_collective02</lua>
+ <lua>empire/collective/ec02</lua>
<flags>
<unique>1</unique>
</flags>
@@ -81,7 +81,7 @@
</avail>
</mission>
<mission name="Collective Espionage 3">
- <lua>emp_collective03</lua>
+ <lua>empire/collective/ec03</lua>
<flags>
<unique>1</unique>
</flags>
@@ -94,7 +94,7 @@
</avail>
</mission>
<mission name="Collective Distraction">
- <lua>emp_collective04</lua>
+ <lua>empire/collective/ec04</lua>
<flags>
<unique>1</unique>
</flags>
@@ -107,7 +107,7 @@
</avail>
</mission>
<mission name="Operation Black Trinity">
- <lua>emp_collective05</lua>
+ <lua>empire/collective/ec05</lua>
<flags>
<unique>1</unique>
</flags>
@@ -120,7 +120,7 @@
</avail>
</mission>
<mission name="Operation Cold Metal">
- <lua>emp_collective06</lua>
+ <lua>empire/collective/ec06</lua>
<flags>
<unique>1</unique>
</flags>
@@ -133,7 +133,7 @@
</avail>
</mission>
<mission name = "Nebulae Satellite">
- <lua>nebu_satellite</lua>
+ <lua>neutral/nebu_satellite</lua>
<flags>
<unique>1</unique>
</flags>
diff --git a/dat/missions/emp_collective00.lua b/dat/missions/empire/collective/ec00.lua
similarity index 100%
rename from dat/missions/emp_collective00.lua
rename to dat/missions/empire/collective/ec00.lua
diff --git a/dat/missions/emp_collective01.lua b/dat/missions/empire/collective/ec01.lua
similarity index 100%
rename from dat/missions/emp_collective01.lua
rename to dat/missions/empire/collective/ec01.lua
diff --git a/dat/missions/emp_collective02.lua b/dat/missions/empire/collective/ec02.lua
similarity index 100%
rename from dat/missions/emp_collective02.lua
rename to dat/missions/empire/collective/ec02.lua
diff --git a/dat/missions/emp_collective03.lua b/dat/missions/empire/collective/ec03.lua
similarity index 100%
rename from dat/missions/emp_collective03.lua
rename to dat/missions/empire/collective/ec03.lua
diff --git a/dat/missions/emp_collective04.lua b/dat/missions/empire/collective/ec04.lua
similarity index 100%
rename from dat/missions/emp_collective04.lua
rename to dat/missions/empire/collective/ec04.lua
diff --git a/dat/missions/emp_collective05.lua b/dat/missions/empire/collective/ec05.lua
similarity index 100%
rename from dat/missions/emp_collective05.lua
rename to dat/missions/empire/collective/ec05.lua
diff --git a/dat/missions/emp_collective06.lua b/dat/missions/empire/collective/ec06.lua
similarity index 100%
rename from dat/missions/emp_collective06.lua
rename to dat/missions/empire/collective/ec06.lua
diff --git a/dat/missions/emp_cargo00.lua b/dat/missions/empire/emp_cargo00.lua
similarity index 100%
rename from dat/missions/emp_cargo00.lua
rename to dat/missions/empire/emp_cargo00.lua
diff --git a/dat/missions/es_cargo.lua b/dat/missions/empire/es_cargo.lua
similarity index 100%
rename from dat/missions/es_cargo.lua
rename to dat/missions/empire/es_cargo.lua
diff --git a/dat/missions/cargo.lua b/dat/missions/neutral/cargo.lua
similarity index 100%
rename from dat/missions/cargo.lua
rename to dat/missions/neutral/cargo.lua
diff --git a/dat/missions/nebu_satellite.lua b/dat/missions/neutral/nebu_satellite.lua
similarity index 100%
rename from dat/missions/nebu_satellite.lua
rename to dat/missions/neutral/nebu_satellite.lua
diff --git a/scripts/ai/tpl/merchant.lua b/scripts/ai/tpl/merchant.lua
index 0ad310b..efe0ab8 100644
--- a/scripts/ai/tpl/merchant.lua
+++ b/scripts/ai/tpl/merchant.lua
@@ -30,7 +30,7 @@ function control()
end
-- See if another enemy is closer.
- if enemy nil and enemy ~= target then
+ if enemy ~= nil and enemy ~= target then
ai.poptask()
ai.pushtask(0, "runaway", enemy)
end
diff --git a/src/lluadef.h b/src/lluadef.h
index 2807fb9..22426cb 100644
--- a/src/lluadef.h
+++ b/src/lluadef.h
@@ -7,7 +7,7 @@
/* Debug stuff. */
#ifdef NODEBUG
#ifdef DEBUG_PARANOID
-#define LLUA_DEBUF(str, args...) \
+#define LLUA_DEBUG(str, args...) \
(fprintf(stdout, "Lua: "str"\n, ## args), abort())
#else
#define LLUA_DEBUG(str, args...) \