From dc9f089abe5690dc43dee82cb6f535de97dd36ad Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Fri, 15 Feb 2013 02:34:40 +0000
Subject: [PATCH] [Fix] *Now* it's fixed.. Forgot to correct lua and xml files.
---
dat/gui.xml | 8 ++++----
dat/outfit.xml | 2 +-
dat/ship.xml | 12 ++++++------
scripts/ai/basic.lua | 2 +-
scripts/ai/pirate.lua | 6 +++---
scripts/ai/test.lua | 2 +-
src/pilot.c | 2 +-
src/pilot.h | 4 ++--
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dat/gui.xml b/dat/gui.xml
index 7861d1c..e6047a1 100644
--- a/dat/gui.xml
+++ b/dat/gui.xml
@@ -17,12 +17,12 @@
<x>10</x>
<y>201</y>
</shield>
- <armor>
+ <armour>
<w>129</w>
<h>10</h>
<x>10</x>
<y>218</y>
- </armor>
+ </armour>
<energy>
<w>129</w>
<h>10</h>
@@ -72,12 +72,12 @@
<x>52</x>
<y>201</y>
</shield>
- <armor>
+ <armour>
<w>98</w>
<h>8</h>
<x>52</x>
<y>212</y>
- </armor>
+ </armour>
<energy>
<w>98</w>
<h>8</h>
diff --git a/dat/outfit.xml b/dat/outfit.xml
index 7323505..b368d2e 100644
--- a/dat/outfit.xml
+++ b/dat/outfit.xml
@@ -14,7 +14,7 @@
<range>300</range>
<accuracy>30</accuracy>
<damage>
- <armor>20</armor>
+ <armour>20</armour>
<shield>10</shield>
</damage>
</specific>
diff --git a/dat/ship.xml b/dat/ship.xml
index 89c490d..7be7fb1 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -11,10 +11,10 @@
</movement>
<health>
<shield>70</shield>
- <armor>80</armor>
+ <armour>80</armour>
<energy>240</energy>
<shield_regen>80</shield_regen>
- <armor_regen>50</armor_regen>
+ <armour_regen>50</armour_regen>
<energy_regen>40</energy_regen>
</health>
<characteristics>
@@ -38,10 +38,10 @@
</movement>
<health>
<shield>50</shield>
- <armor>60</armor>
+ <armour>60</armour>
<energy>180</energy>
<shield_regen>100</shield_regen>
- <armor_regen>60</armor_regen>
+ <armour_regen>60</armour_regen>
<energy_regen>40</energy_regen>
</health>
<characteristics>
@@ -65,10 +65,10 @@
</movement>
<health>
<shield>160</shield>
- <armor>120</armor>
+ <armour>120</armour>
<energy>360</energy>
<shield_regen>90</shield_regen>
- <armor_regen>60</armor_regen>
+ <armour_regen>60</armour_regen>
<energy_regen>50</energy_regen>
</health>
<characteristics>
diff --git a/scripts/ai/basic.lua b/scripts/ai/basic.lua
index 0f96661..263eddc 100644
--- a/scripts/ai/basic.lua
+++ b/scripts/ai/basic.lua
@@ -37,7 +37,7 @@ function attack()
local dir = face(target)
local dist = getdist(getpos(target))
- if parmor() < 70 then
+ if parmour() < 70 then
poptask()
pushtask(0, "runaway", target)
elseif dir < 10 and dist > 300 then
diff --git a/scripts/ai/pirate.lua b/scripts/ai/pirate.lua
index 99299cd..441cf0c 100644
--- a/scripts/ai/pirate.lua
+++ b/scripts/ai/pirate.lua
@@ -7,7 +7,7 @@ function control()
-- Running pilot has healed up some.
if task == "runaway" then
- if parmor() == 100 then
+ if parmour() == 100 then
-- "attack" should be called after "runaway".
poptask()
end
@@ -16,7 +16,7 @@ function control()
elseif task ~= "attack" and task ~= "runaway" then
-- If getenemy() is 0, there is no enemy around.
enemy = getenemy()
- if parmor() == 100 and enemy ~= 0 then
+ if parmour() == 100 and enemy ~= 0 then
-- Taunts.
num = rng(0,4)
if num == 0 then msg "Prepare to be boarded!"
@@ -92,7 +92,7 @@ function attack()
dist = getdist(getpos(target))
-- We need to know when to run away.
- if parmor() < 70 then
+ if parmour() < 70 then
pushtask(0, "runaway", target)
-- Try to obliterate the target.
elseif dir < 10 and dist > 300 then
diff --git a/scripts/ai/test.lua b/scripts/ai/test.lua
index dd6f971..dac40b3 100644
--- a/scripts/ai/test.lua
+++ b/scripts/ai/test.lua
@@ -52,7 +52,7 @@ function attack()
dir = face(target)
dist = getdist(getpos(target))
- if parmor() < 70 then
+ if parmour() < 70 then
poptask()
pushtask(0, "runaway", target)
elseif dir < 10 and dist > 300 then
diff --git a/src/pilot.c b/src/pilot.c
index bee6f44..fc48b95 100644
--- a/src/pilot.c
+++ b/src/pilot.c
@@ -157,7 +157,7 @@ void pilot_render(Pilot* p) {
// Update the pilot.
static void pilot_update(Pilot* pilot, const double dt) {
- if(pilot != player && pilot->armour < PILOT_DISABLED_ARMOR * pilot->armour_max) {
+ if(pilot != player && pilot->armour < PILOT_DISABLED_ARMOUR * pilot->armour_max) {
// We are disabled.
pilot_setFlag(pilot, PILOT_DISABLED);
// Come to a halt slowly.
diff --git a/src/pilot.h b/src/pilot.h
index 007b9a8..10c6c8e 100644
--- a/src/pilot.h
+++ b/src/pilot.h
@@ -9,8 +9,8 @@
#define PLAYER_ID 1
// Aproximation for pilot size.
-#define PILOT_SIZE_APROX 0.8
-#define PILOT_DISABLED_ARMOR 0.2 // Based on armour percentage.
+#define PILOT_SIZE_APROX 0.8
+#define PILOT_DISABLED_ARMOUR 0.2 // Based on armour percentage.
// Flags.
#define pilot_isFlag(p,f) (p->flags & f)