From d31b9dad30dea19a2c8f250b976afda1eb3ca32e Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Sun, 10 Mar 2013 16:31:55 +0000
Subject: [PATCH] [Add] Empty StarSystem and made ai use it!
---
dat/ssys.xml | 25 +++++++++++++++++++++++++
scripts/ai/merchant.lua | 7 ++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/dat/ssys.xml b/dat/ssys.xml
index 93758b2..1fe4ef8 100644
--- a/dat/ssys.xml
+++ b/dat/ssys.xml
@@ -23,6 +23,7 @@
<fleet chance="40">Sml Merchant Convoy</fleet>
</fleets>
<jumps>
+ <jump>NCG-7291</jump>
<jump>SaraSys</jump>
</jumps>
</ssys>
@@ -45,6 +46,30 @@
<fleet chance="60">Merchant Ship</fleet>
</fleets>
<jumps>
+ <jump>NCG-7291</jump>
+ <jump>KonoSys</jump>
+ </jumps>
+ </ssys>
+ <ssys name="NCG-7291">
+ <pos>
+ <x>23</x>
+ <y>24</y>
+ </pos>
+ <general>
+ <stars>230</stars>
+ <asteroids>0</asteroids>
+ <interference>0</interference>
+ </general>
+ <planets>
+ </planets>
+ <fleets>
+ <fleet chance="80">Merchant Ship</fleet>
+ <fleet chance="60">Merchant Mule</fleet>
+ <fleet chance="60">Pirate</fleet>
+ <fleet chance="60">Pirate</fleet>
+ </fleets>
+ <jumps>
+ <jump>SaraSys</jump>
<jump>KonoSys</jump>
</jumps>
</ssys>
diff --git a/scripts/ai/merchant.lua b/scripts/ai/merchant.lua
index e1622a3..501db19 100644
--- a/scripts/ai/merchant.lua
+++ b/scripts/ai/merchant.lua
@@ -12,7 +12,12 @@ function control()
end
elseif task == "none" then
planet = ai.rndplanet()
- ai.pushtask(0, "go", planet)
+ -- Planet must exist.
+ if planet == nil then
+ ai.pushtask(0, "hyperspace")
+ else
+ ai.pushtask(0, "go", planet)
+ end
end
end