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 @@
10
201
-
+
129
10
10
218
-
+
129
10
@@ -72,12 +72,12 @@
52
201
-
+
98
8
52
212
-
+
98
8
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 @@
300
30
- 20
+ 20
10
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 @@
70
- 80
+ 80
240
80
- 50
+ 50
40
@@ -38,10 +38,10 @@
50
- 60
+ 60
180
100
- 60
+ 60
40
@@ -65,10 +65,10 @@
160
- 120
+ 120
360
90
- 60
+ 60
50
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)