Merge branch '3dgalaxy'

Conflicts: data/modules/DeliverPackage.lua
pioneerspacesim · Aug 20, 2011 · c3de7d0 · c3de7d0
2 parents 05e9768 + 6c5fba7
commit c3de7d0
Show file tree

Hide file tree

Showing 953 changed files with 1,910 additions and 1,413 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -3,6 +3,7 @@ Alpha 14
   * New features
     * Lua attribute SBody.parent to find the parent of a system body (#359, #368)
     * Delivery missions to other starports in the same system (#388)
+    * 3D galaxy (#394)
 
   * Fixes
     * Remove a couple of hardcoded references to the data directory (#363)

diff --git a/data/lang/Deutsch.txt b/data/lang/Deutsch.txt
@@ -276,7 +276,7 @@ WATER
 MEDICINES
     Arzneimittel
 CONSUMER_GOODS
-    Consumer goods
+    Verbrauchsgüter
 COMPUTERS
     Computer
 ROBOTS
@@ -653,24 +653,30 @@ VIOLENT_ANARCHY
     Störung - Insgesamt Governance durch bewaffnete Gruppierungen bestritten
 X_CANNOT_BE_TOLERATED_HERE
     %s kann hier nicht geduldet werden.
-SECTOR_X_Y
-    Sektor: %d,%d
-DISTANCE_FUEL_TIME
-    Abst. %.2f Lichtjahre (Kraftstoff benötigt: %dt | Zeitverlust: %.1fst.)
+SECTOR_X_Y_Z
+    Sektor: %d,%d,%d
 CURRENT_SYSTEM
     Aktuelle System
-DISTANCE_FUEL_REQUIRED
-    Abst. %.2f Lichtjahre (unzureichende Kraftstoff; benötigt: %dt)
-DISTANCE_OUT_OF_RANGE
-    Abst. %.2f Lichtjahre (Außerhalb der Reichweite)
-CANNOT_HYPERJUMP_WITHOUT_WORKING_DRIVE
-    Sie können nicht durchführen Hypersprung weil Sie nicht ein funktionierende Hyperlaufwerk haben
+SELECTED_SYSTEM
+    Ausgewählter System
+HYPERSPACE_TARGET
+    Hyperraum Ziel
+FOLLOWING_SELECTION
+    Auswahl folgende
+LOCKED
+    verschlossen
+NUMBER_HOURS
+    %.2f St.
 QUADRUPLE_SYSTEM
-    "VierfachSternsystem. "
+    VierfachSternsystem
 TRIPLE_SYSTEM
-    "DreifachSternsystem. "
+    DreifachSternsystem
 BINARY_SYSTEM
-    "DoppelSternsystem. "
+    DoppelSternsystem
+ENABLED_AUTOMATIC_SYSTEM_SELECTION
+    Automatische Systemauswahl aktiviert.
+DISABLED_AUTOMATIC_SYSTEM_SELECTION
+    Automatische Systemauswahl unaktiviert.
 FUEL_SCOOP_ACTIVE_N_TONNES_H_COLLECTED
     Kraftstoffschaufel aktiv. Sie haben nun %d Tonnen Wasserstoff.
 CARGO_BAY_LIFE_SUPPORT_LOST
@@ -1043,8 +1049,8 @@ M_S_RELATIVE_TO
     %.0f m/s bez-auf %s
 N_DISTANCE_TO_TARGET
     %s nach Ziel
-IN_TRANSIT_TO_N_X_X
-    Auf dem Weg nach %s [%d,%d]
+IN_TRANSIT_TO_N_X_X_X
+    Auf dem Weg nach %s [%d,%d,%d]
 ALT_IN_METRES
     Höhe: %.0fm
 PRESSURE_N_BAR
@@ -1084,7 +1090,7 @@ FINE_PAID_N_BUT_N_REMAINING
 FINE_PAID_N
     Sie haben die Geldstrafe von %s bezahlt.
 SET_HYPERSPACE_DESTINATION_TO
-    "Set Hyperraum Ziel nach "
+    "Hyperraum Ziel nach %s angesetzt"
 NO_TARGET_SELECTED
     Schiffsrechner: Kein Ziel ausgewählt
 REQUEST_DOCKING_CLEARANCE
@@ -1109,3 +1115,5 @@ COMPLETED
     Fertig
 ACTIVE
     Aktuell
+DISTANCE_LY
+    Entfernung: %0.2f Lj
diff --git a/data/lang/English.txt b/data/lang/English.txt
@@ -653,24 +653,36 @@ VIOLENT_ANARCHY
     Disorder - Overall governance contested by armed factions
 X_CANNOT_BE_TOLERATED_HERE
     %s cannot be tolerated here.
-SECTOR_X_Y
-    Sector: %d,%d
-DISTANCE_FUEL_TIME
-    Dist. %.2f light years (fuel required: %dt | time loss: %.1fhrs)
+SECTOR_X_Y_Z
+    Sector: %d,%d,%d
 CURRENT_SYSTEM
     Current system
-DISTANCE_FUEL_REQUIRED
-    Dist. %.2f light years (insufficient fuel, required: %dt)
-DISTANCE_OUT_OF_RANGE
-    Dist. %.2f light years (out of range)
-CANNOT_HYPERJUMP_WITHOUT_WORKING_DRIVE
-    You cannot perform a hyperjump because you do not have a functioning hyperdrive
+SELECTED_SYSTEM
+    Selected system
+HYPERSPACE_TARGET
+    Hyperspace target
+FOLLOWING_SELECTION
+    following selection
+LOCKED
+    locked
+EXACT_MATCH_X
+    Exact match: %s
+NOT_FOUND_BEST_MATCH_X
+    Not found, best match: %s
+NOT_FOUND
+    Not found
+NUMBER_HOURS
+    %.2f hrs
 QUADRUPLE_SYSTEM
-    "Quadruple system. "
+    Quadruple system
 TRIPLE_SYSTEM
-    "Triple system. "
+    Triple system
 BINARY_SYSTEM
-    "Binary system. "
+    Binary system
+ENABLED_AUTOMATIC_SYSTEM_SELECTION
+    Enabled automatic system selection.
+DISABLED_AUTOMATIC_SYSTEM_SELECTION
+    Disabled automatic system selection.
 FUEL_SCOOP_ACTIVE_N_TONNES_H_COLLECTED
     Fuel scoop active. You now have %d tonnes of hydrogen.
 CARGO_BAY_LIFE_SUPPORT_LOST
@@ -1043,8 +1055,8 @@ M_S_RELATIVE_TO
     %.0f m/s rel-to %s
 N_DISTANCE_TO_TARGET
     %s to target
-IN_TRANSIT_TO_N_X_X
-    In transit to %s [%d,%d]
+IN_TRANSIT_TO_N_X_X_X
+    In transit to %s [%d,%d,%d]
 ALT_IN_METRES
     Alt: %.0fm
 PRESSURE_N_BAR
@@ -1084,7 +1096,7 @@ FINE_PAID_N_BUT_N_REMAINING
 FINE_PAID_N
     You have paid the fine of %s.
 SET_HYPERSPACE_DESTINATION_TO
-    "Set hyperspace destination to "
+    "Set hyperspace destination to %s"
 NO_TARGET_SELECTED
     Ship Computer: No target selected
 REQUEST_DOCKING_CLEARANCE
@@ -1109,3 +1121,5 @@ COMPLETED
     Completed
 ACTIVE
     Active
+DISTANCE_LY
+    Distance: %0.2f ly
diff --git a/data/modules/DeliverPackage.lua b/data/modules/DeliverPackage.lua
@@ -16,7 +16,7 @@ local delivery_flavours = {
 	-- local - 1 if the delivery is to the local (this) system, 0 otherwise
 	{
 		adtext = "GOING TO the {system} system? Money paid for delivery of a small package.",
-		introtext = "Hi, I'm {name}. I'll pay you {cash} if you will deliver a small package to {starport} in the {system} ({sectorx}, {sectory}) system.",
+		introtext = "Hi, I'm {name}. I'll pay you {cash} if you will deliver a small package to {starport} in the {system} ({sectorx}, {sectory}, {sectorz}) system.",
 		whysomuchtext = "When a friend visited me she left behind some clothes and antique paper books. I'd like to have them returned to her.",
 		successmsg = "Thank you for the delivery. You have been paid in full.",
 		failuremsg = "Unacceptable! You took forever over that delivery. I'm not willing to pay you.",
@@ -26,7 +26,7 @@ local delivery_flavours = {
 
 	}, {
 		adtext = "WANTED. Delivery of a package to the {system} system.",
-		introtext = "Hello. I'm {name}. I'm willing to pay {cash} for a ship to carry a package to {starport} in the {system} ({sectorx}, {sectory}) system.",
+		introtext = "Hello. I'm {name}. I'm willing to pay {cash} for a ship to carry a package to {starport} in the {system} ({sectorx}, {sectory}, {sectorz}) system.",
 		whysomuchtext = "It is nothing special.",
 		successmsg = "The package has been received and you have been paid in full.",
 		failuremsg = "I'm frustrated by the late delivery of my package, and I refuse to pay you.",
@@ -35,7 +35,7 @@ local delivery_flavours = {
 		localdelivery = 0,
 	}, {
 		adtext = "URGENT. Fast ship needed to deliver a package to the {system} system.",
-		introtext = "Hello. I'm {name}. I'm willing to pay {cash} for a ship to carry a package to {starport} in the {system} ({sectorx}, {sectory}) system.",
+		introtext = "Hello. I'm {name}. I'm willing to pay {cash} for a ship to carry a package to {starport} in the {system} ({sectorx}, {sectory}, {sectorz}) system.",
 		whysomuchtext = "It is a research proposal and must be delivered by the deadline or we may not get funding.",
 		successmsg = "You have been paid in full for the delivery. Thank you.",
 		failuremsg = "I was quite clear about the deadline and am very disappointed by the late delivery. You will not be paid.",
@@ -44,7 +44,7 @@ local delivery_flavours = {
 		localdelivery = 0,
 	}, {
 		adtext = "DELIVERY. Documents to the {system} system. {cash} to an experienced pilot.",
-		introtext = "Hello. I'm {name}. I'm willing to pay {cash} for a ship to carry a package to {starport} in the {system} ({sectorx}, {sectory}) system.",
+		introtext = "Hello. I'm {name}. I'm willing to pay {cash} for a ship to carry a package to {starport} in the {system} ({sectorx}, {sectory}, {sectorz}) system.",
 		whysomuchtext = "Some extremely sensitive documents have fallen into my hands, and I have reason to believe that the leak has been traced to me.",
 		successmsg = "Your timely and discrete service is much appreciated. You have been paid in full.",
 		failuremsg = "Useless! I will never depend on you again! Needless to say, you will not be paid for this.",
@@ -53,7 +53,7 @@ local delivery_flavours = {
 		localdelivery = 0,
 	}, {
 		adtext = "POSTAL SERVICE. We require a ship for the delivery run to {system} system.",
-		introtext = "Greetings. This is an automated message from Bedford and {name} Courier Services. We pay {cash} for the run to {starport} in the {system} ({sectorx}, {sectory}) system.",
+		introtext = "Greetings. This is an automated message from Bedford and {name} Courier Services. We pay {cash} for the run to {starport} in the {system} ({sectorx}, {sectory}, {sectorz}) system.",
 		whysomuchtext = "We would be happy to pay you less money.",
 		successmsg = "Your timely and discrete service is much appreciated. You have been paid in full.",
 		failuremsg = "Your ship registration has been noted, we will reject all further applications for work from you.",
@@ -160,6 +160,7 @@ local onChat = function (form, ref, option)
 			system   = sys.name,
 			sectorx  = ad.location.sectorX,
 			sectory  = ad.location.sectorY,
+			sectorz  = ad.location.sectorZ,
 		})
 
 		form:SetMessage(introtext)

diff --git a/data/systems/p00p00/00_sol.lua → data/systems/00_sol.lua b/data/systems/p00p00/00_sol.lua → data/systems/00_sol.lua
@@ -455,4 +455,4 @@ s:bodies(sol, {
 		charon,
 })
 
-s:add_to_sector(0,0,v(0.5,0.5,0))
+s:add_to_sector(0,0,0,v(0.001,0.001,0.001))
diff --git a/data/systems/p01p00/01_epsilon_eridani.lua → data/systems/01_epsilon_eridani.lua b/data/systems/p01p00/01_epsilon_eridani.lua → data/systems/01_epsilon_eridani.lua
@@ -141,4 +141,4 @@ local hercules = CustomSBody:new('Hercules', 'PLANET_GAS_GIANT')
 		hale,
 	})
 
-s:add_to_sector(1,0,v(0.351,0.735,-0.999))
+s:add_to_sector(1,0,-1,v(0.037,0.775,0.784))