Merge branch 'main' into omnis-integration

a-random-lemurian · Oct 31, 2024 · 2482278 · 2482278
2 parents e7ee5dd + 6bc9b4c
commit 2482278
Show file tree

Hide file tree

Showing 51 changed files with 121 additions and 51 deletions.
diff --git a/data/amidala variants.txt b/data/amidala variants.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/commodities.txt b/data/commodities.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the
@@ -40,6 +40,7 @@ trade
 		"archived emails"
 		"archived websites"
 		"browser history"
+		`copies of Anna Fangvin's "Beyond the Hyperdrive" novel`
 		"C source code files"
 		"C++ source code files"
 		"chatlogs"

diff --git a/data/factions/animeorg/animeorg jobs.txt b/data/factions/animeorg/animeorg jobs.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/animeorg/animeorg landing.txt b/data/factions/animeorg/animeorg landing.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/animeorg/animeorg news.txt b/data/factions/animeorg/animeorg news.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/animeorg/animeorg spaceport news.txt b/data/factions/animeorg/animeorg spaceport news.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/animeorg/animeorg transport from hs jobs.txt b/data/factions/animeorg/animeorg transport from hs jobs.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/animeorg/animeorg.txt b/data/factions/animeorg/animeorg.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/cssf/cssf fleets.txt b/data/factions/cssf/cssf fleets.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/cssf/cssf specialized fleets.txt b/data/factions/cssf/cssf specialized fleets.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa combat jobs.txt b/data/factions/spa/spa combat jobs.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa dialog.txt b/data/factions/spa/spa dialog.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa fleets.txt b/data/factions/spa/spa fleets.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa jobs.txt b/data/factions/spa/spa jobs.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa log.txt b/data/factions/spa/spa log.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa news.txt b/data/factions/spa/spa news.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa specialized fleets.txt b/data/factions/spa/spa specialized fleets.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa start.txt b/data/factions/spa/spa start.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/factions/spa/spa weapons.txt b/data/factions/spa/spa weapons.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/fleets.txt b/data/fleets.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/governments.txt b/data/governments.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/hails/animeorg hails.txt b/data/hails/animeorg hails.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/hails/civillian hails.txt b/data/hails/civillian hails.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/hails/hail phrases.txt b/data/hails/hail phrases.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/hails/hidalgo shrine hails.txt b/data/hails/hidalgo shrine hails.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/hails/spa hails.txt b/data/hails/spa hails.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/jobs.txt b/data/jobs.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/jobs/illegal/illegal data transport.txt b/data/jobs/illegal/illegal data transport.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/jobs/misc/martieu data smuggling.txt b/data/jobs/misc/martieu data smuggling.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/linux user news.txt b/data/linux user news.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/map.txt b/data/map.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/misc/deprecated.txt b/data/misc/deprecated.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/names/cssf names.txt b/data/names/cssf names.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/names/japan names.txt b/data/names/japan names.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/names/names.txt b/data/names/names.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/names/spa names.txt b/data/names/spa names.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/names/uuid.txt b/data/names/uuid.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/news.txt b/data/news.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/omnis support.txt b/data/omnis support.txt
@@ -0,0 +1,69 @@
+planet "Amidala "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Amidala "
+		threshold 0
+
+planet "Amidala  "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "Amidala "
+		threshold 0
+
+fleet "Amidala "
+	government "Arena"
+	personality "heroic"
+	variant
+		"Amidala"
+
+planet "SPA Rosas "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "SPA Rosas "
+		threshold 0
+
+planet "SPA Rosas  "
+	bribe 0
+	government "Arena"
+	tribute 1
+		fleet "SPA Rosas "
+		threshold 0
+
+fleet "SPA Rosas "
+	government "Arena"
+	personality "heroic"
+	variant
+		"SPA Rosas"
+
+shipyard "LEEST"
+	"Amidala"
+	"SPA Rosas"
+
+planet "LEEST "
+	description ""
+	port "Settings'
+		recharges all
+		services all
+	shipyard "LEEST"
+	bribe 0
+
+system "Human "
+	add link "LEEST "
+
+system "LEEST "
+	"jump range" 3000
+	government "Plugin"
+	link "Human "
+	pos -200 -9700
+	object "LEEST "
+		sprite "asteroid/yottrite/spin"
+	object "Amidala  "
+		distance 400
+		offset 180
+		sprite "ship/amidala"
+	object "SPA Rosas  "
+		distance 400
+		sprite "ship/arach spindle"
diff --git a/data/pelitol cluster.txt b/data/pelitol cluster.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/persons.txt b/data/persons.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the
@@ -202,7 +202,7 @@ person "Lemuria"
 			"Ako si Lemuria." # I am Lemuria.
 			"Alam mo ba ang Tagalog?" # Do you know Tagalog?
 			"Nagbabasa ako!" # I am reading!
-			"Magbasa ka ng mga ${book in tagalog} ni Anne Rice! Magugustuhan mo!" # Read some Anne Rice books. You'll like it!
+			"Basahin mo ang mga ${book in tagalog} ni Anne Rice! Magugustuhan mo!" # Read some Anne Rice books. You'll like it!
 			"Kamusta!" # Hello!
 			"Mag-aral ka ng Tagalog!" # Learn Tagalog!
 			"Salamat po sa pag-lalaro niyo ng aking plugin." # Thank you for playing my plugin.

diff --git a/data/phrases.txt b/data/phrases.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/sales.txt b/data/sales.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/ships.txt b/data/ships.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the

diff --git a/data/sidemissions/animeorg anime retrieval.txt b/data/sidemissions/animeorg anime retrieval.txt
@@ -1,5 +1,5 @@
 # LEESt: The world's greatest Endless Sky plugin.
-# Copyright (C) 2021-2023 Lemuria
+# Copyright (C) 2021-2024 Lemuria
 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU
 # General Public License as published by the Free Software Foundation, either version 3 of the