From a6e515936e628f2e8ef58f90e0ffce2936c2499f Mon Sep 17 00:00:00 2001
From: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com>
Date: Wed, 2 Oct 2024 06:16:19 +0300
Subject: [PATCH] Incipias Arena, fix bugs (#63)

* Incipias arena

* Removed variants and outfitters that no longer exist

* Add a workflow to tell when there are problems

* Update ci.yml
---
 .github/workflows/ci.yml | 32 +++++++++++++++
 data/arena.txt           | 87 +++++++++++++++++++++++++++++++++++++++-
 data/map.txt             | 28 +++++++++++++
 data/objects.txt         |  3 --
 data/sales.txt           |  4 --
 5 files changed, 146 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..ee43608
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  push:
+     branches:
+       - main
+  pull_request:
+     types: [opened, synchronize]
+
+jobs:
+  test-parse:
+    name: Data Files
+    runs-on: windows-2022
+    env:
+      CONTINUOUS: EndlessSky-win64-continuous.zip
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+    - name: Download latest continuous
+      run: gh release download -R endless-sky/endless-sky continuous -p ${{ env.CONTINUOUS }}
+    - name: Extract and prepare continuous
+      run: |
+        Expand-Archive ${{ env.CONTINUOUS }} -DestinationPath endless-sky -Force
+        cd .\endless-sky
+        mkdir plugins
+        cd .\plugins
+        mkdir Omnis
+    - uses: actions/checkout@v4
+      with:
+        path: '.\endless-sky\plugins\Omnis'
+    - name: Parse Datafiles
+      run: "'.\\endless-sky\\Endless Sky.exe' -p"
+      shell: bash
diff --git a/data/arena.txt b/data/arena.txt
index ca544d5..021a91d 100644
--- a/data/arena.txt
+++ b/data/arena.txt
@@ -4715,4 +4715,89 @@ fleet "Nnaatej "
 	government "Arena"
 	personality "heroic"
 	variant
-		"Nnaatej"
\ No newline at end of file
+		"Nnaatej"
+planet "Gero "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Gero "
+		threshold 0
+planet "Gero  "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Gero "
+		threshold 0
+fleet "Gero "
+	government "Arena"
+	personality "heroic"
+	variant
+		"Gero"
+planet "Nimbo Cirrus "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Nimbo Cirrus "
+		threshold 0
+planet "Nimbo Cirrus  "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Nimbo Cirrus "
+		threshold 0
+fleet "Nimbo Cirrus "
+	government "Arena"
+	personality "heroic"
+	variant
+		"Nimbo Cirrus"
+planet "Nimbo Stratus "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Nimbo Stratus "
+		threshold 0
+planet "Nimbo Stratus  "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Nimbo Stratus "
+		threshold 0
+fleet "Nimbo Stratus "
+	government "Arena"
+	personality "heroic"
+	variant
+		"Nimbo Stratus"
+planet "Nimbus "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Nimbus "
+		threshold 0
+planet "Nimbus  "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Nimbus "
+		threshold 0
+fleet "Nimbus "
+	government "Arena"
+	personality "heroic"
+	variant
+		"Nimbus"
+planet "Venta "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Venta "
+		threshold 0
+planet "Venta  "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Venta "
+		threshold 0
+fleet "Venta "
+	government "Arena"
+	personality "heroic"
+	variant
+		"Venta"
\ No newline at end of file
diff --git a/data/map.txt b/data/map.txt
index 5e83ed1..f6f7905 100644
--- a/data/map.txt
+++ b/data/map.txt
@@ -1781,6 +1781,33 @@ system "Iije "
 		distance 900
 		offset 60
 		sprite "ship/ayym/ayym"
+system "Incipias "
+	"jump range" 3000
+	government "Faction"
+	pos 65 -10303
+	object "  Incipias"
+		sprite "asteroid/yottrite/spin"
+	# Arena
+	object "Gero  "
+		distance 900
+		offset 30
+		sprite "ship/gero"
+	object "Nimbo Cirrus  "
+		distance 900
+		offset 60
+		sprite "ship/cirrus"
+	object "Nimbo Stratus  "
+		distance 900
+		offset 60
+		sprite "ship/stratus"
+	object "Nimbus  "
+		distance 900
+		offset 90
+		sprite "ship/nimbus"
+	object "Venta  "
+		distance 900
+		offset 90
+		sprite "ship/venta"
 system "Ka'het "
 	"jump range" 3000
 	government "Faction"
@@ -2097,6 +2124,7 @@ system "Successors "
 	pos -42 -9363
 	object "  Successors"
 		sprite "asteroid/yottrite/spin"
+	# Arena
 	object "Kvelqde  "
 		distance 900
 		offset 30
diff --git a/data/objects.txt b/data/objects.txt
index 605a2f9..e86bcd7 100644
--- a/data/objects.txt
+++ b/data/objects.txt
@@ -97,7 +97,6 @@ planet "Everything "
 	outfitter "Ammo North"
 	outfitter "Ammo South"
 	outfitter "Basic Outfits"
-	outfitter "Basic Weapons"
 	outfitter "Common Outfits"
 	outfitter "Deep Sky Advanced"
 	outfitter "Deep Sky Basics"
@@ -387,7 +386,6 @@ planet " Human"
 	outfitter "Ammo North"
 	outfitter "Ammo South"
 	outfitter "Basic Outfits"
-	outfitter "Basic Weapons"
 	outfitter "Common Outfits"
 	outfitter "Deep Sky Advanced"
 	outfitter "Deep Sky Basics"
@@ -442,7 +440,6 @@ planet "  Human"
 	outfitter "Ammo North"
 	outfitter "Ammo South"
 	outfitter "Basic Outfits"
-	outfitter "Basic Weapons"
 	outfitter "Common Outfits"
 	outfitter "Deep Sky Advanced"
 	outfitter "Deep Sky Basics"
diff --git a/data/sales.txt b/data/sales.txt
index 40bd651..2a9276d 100644
--- a/data/sales.txt
+++ b/data/sales.txt
@@ -265,7 +265,6 @@ shipyard "drakVariants"
 	"Archon (Cloaked)"
 	"Archon B"
 	"Archon C"
-	"Embersylph (Small)"
 	"Void Sprite (Infant)"
 shipyard "drakVariantsAll"
 	"dummy"
@@ -682,19 +681,16 @@ shipyard "humanVariantsAll"
 	"Fury (Gatling)"
 	"Fury (Heavy)"
 	"Fury (Laser)"
-	"Fury (Miner)"
 	"Fury (Missile)"
 	"Gunboat (Mark II)"
 	"Hauler (Hai)"
 	"Hauler II (Hai)"
 	"Hauler III (Hai)"
 	"Hawk (Bomber)"
-	"Hawk (Miner)"
 	"Hawk (Plasma)"
 	"Hawk (Rocket)"
 	"Hawk (Speedy)"
 	"Headhunter (Hai)"
-	"Headhunter (Miner)"
 	"Headhunter (Particle)"
 	"Headhunter (Strike)"
 	"Heavy Shuttle (Armed)"