PP2.0 update fixes

jixxed · Oct 31, 2024 · 625cff3 · 625cff3
1 parent e875ddf
commit 625cff3
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 18 deletions.
diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/domain/ships/Ship.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/domain/ships/Ship.java
@@ -2241,7 +2241,7 @@ public class Ship {
 //                    Map.entry(HorizonsModifier.YAW_ACCELERATION,50.0),
 //                    Map.entry(HorizonsModifier.ROLL_ACCELERATION,80.0),
                         Map.entry(HorizonsModifier.MIN_PITCH_SPEED, 18.0),//TODO
-                        Map.entry(HorizonsModifier.HEAT_CAPACITY, 235.67),//TODO
+                        Map.entry(HorizonsModifier.HEAT_CAPACITY, 235.75),//TODO
                         Map.entry(HorizonsModifier.HEAT_DISSIPATION_MIN, 3.1),//TODO
                         Map.entry(HorizonsModifier.HEAT_DISSIPATION_MAX, 36.25),//TODO
                         Map.entry(HorizonsModifier.FUEL_COST, 50.0),//TODO
@@ -2772,9 +2772,9 @@ public class Ship {
 //                    Map.entry(HorizonsModifier.YAW_ACCELERATION,Double.NaN),
 //                    Map.entry(HorizonsModifier.ROLL_ACCELERATION,Double.NaN),
                         Map.entry(HorizonsModifier.MIN_PITCH_SPEED,24.5),//TODO - unknown
-                        Map.entry(HorizonsModifier.HEAT_CAPACITY,Double.NaN),//TODO - unknown
+                        Map.entry(HorizonsModifier.HEAT_CAPACITY,217.40),//TODO - unknown
                         Map.entry(HorizonsModifier.HEAT_DISSIPATION_MIN,Double.NaN),//TODO - unknown
-                        Map.entry(HorizonsModifier.HEAT_DISSIPATION_MAX,Double.NaN),//TODO - unknown
+                        Map.entry(HorizonsModifier.HEAT_DISSIPATION_MAX,54.14),//TODO - unknown
                         Map.entry(HorizonsModifier.FUEL_COST,50.0),
                         Map.entry(HorizonsModifier.FUEL_RESERVE,0.5),//TODO - check
                         Map.entry(HorizonsModifier.ARMOUR_HARDNESS,55.0),//TODO - check
@@ -2783,12 +2783,12 @@ public class Ship {
 
                 ),// 2 116 55   // 1 -18 -21
                 List.of(//TODO coordinates
-                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(803).y(749).index(0).namedIndex(1).slotSize(1).shipModule(PulseLaser.PULSE_LASER_1_F_F).build(),
-                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1088).y(582).index(1).namedIndex(2).slotSize(1).shipModule(PulseLaser.PULSE_LASER_1_F_F).build(),
-                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1029).y(539).index(2).namedIndex(1).slotSize(2).build(),
-                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(1).x(935).y(429).index(3).namedIndex(2).slotSize(2).build(),
-                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1262).y(528).index(4).namedIndex(3).slotSize(2).build(),
-                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1105).y(359).index(5).namedIndex(4).slotSize(2).build()
+                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1029).y(539).index(0).namedIndex(1).slotSize(2).build(),
+                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(1).x(935).y(429).index(1).namedIndex(2).slotSize(2).build(),
+                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1262).y(528).index(2).namedIndex(3).slotSize(2).build(),
+                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1105).y(359).index(3).namedIndex(4).slotSize(2).build(),
+                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(803).y(749).index(4).namedIndex(1).slotSize(1).shipModule(PulseLaser.PULSE_LASER_1_F_F).build(),
+                        ImageSlot.builder().slotType(SlotType.HARDPOINT).imageIndex(2).x(1088).y(582).index(5).namedIndex(2).slotSize(1).shipModule(PulseLaser.PULSE_LASER_1_F_F).build()
                 ),
                 List.of(//TODO coordinates
                         ImageSlot.builder().slotType(SlotType.UTILITY).imageIndex(1).x(945).y(336).index(0).slotSize(0).build(),

diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/enums/Commodity.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/enums/Commodity.java
@@ -446,6 +446,7 @@ public enum Commodity implements HorizonsMaterial {
     KAINEMISINFORMATION(CommodityType.POWERPLAY, FALSE),
     KAINEAIDSUPPLIES(CommodityType.POWERPLAY, FALSE),
     KAINELOBBYINGMATERIALS(CommodityType.POWERPLAY, FALSE),
+    LAVIGNYSTRATEGICREPORTS(CommodityType.POWERPLAY, FALSE),
     UNKNOWN(CommodityType.UNKNOWN, FALSE);
     private final CommodityType commodityType;
     private final boolean rareCommodity;

diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/enums/Data.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/enums/Data.java
@@ -119,13 +119,12 @@ public enum Data implements OdysseyMaterial {
     XENODEFENCEPROTOCOLS(false, 20),
     POWERPREPARATIONSPYWARE(true, 60, true, true),
     POWERSPYWARE(true, 60, true, true),
+    POWERMEGASHIPDATA(false, 0, false, true),//TODO time
     POWERRESEARCHDATA(false, 0, false, true),//TODO time
     POWEREMPLOYEEDATA(false, 0, false, true),//TODO time
     POWERFINANCIALRECORDS(false, 0, false, true),//TODO time
     POWERPROPAGANDADATA(false, 0, false, true),//TODO time
     POWERCLASSIFIEDDATA(false, 0, false, true),//TODO time
-    POWERSECURITY(false, 0, false, true),//TODO time
-    POWERPOWER(false, 0, false, true),//TODO time
     UNKNOWN(false, 0);
     private final boolean illegal;
     private final int transferTime;

diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/enums/Good.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/enums/Good.java
@@ -56,7 +56,13 @@ public enum Good implements OdysseyMaterial {
     POWERCOMPUTER(false, true),
     POWEREXPERIMENT(false, true),
     POWERAGRICULTURE(false, true),
+    POWERMEDICAL(false, true),
     POWEREXTRACTION(false, true),
+    POWERMISCCOMPUTER(false, true),
+    POWERSECURITY(false, true),
+    POWERPOWER(false, true),
+    POWEREQUIPMENT(false, true),
+    POWERRESEARCH(false, true),
     UNKNOWN(false);
     private final boolean illegal;
     private boolean powerplay = false;

diff --git a/application/src/main/resources/locale/material/horizons/commodity.csv b/application/src/main/resources/locale/material/horizons/commodity.csv
@@ -438,3 +438,4 @@ material.commodity.thargoidtitandrivecomponent,Titan Drive Component,,,Component
 material.commodity.kainemisinformation,Kaine Misinformation,,,,,,
 material.commodity.kaineaidsupplies,Kaine Aid Supplies,,,,,,
 material.commodity.kainelobbyingmaterials,Kaine Lobbying Materials,,,,,,
+material.commodity.lavignystrategicreports,Lavigny Strategic Reports,,,,,,
diff --git a/application/src/main/resources/locale/material/odyssey/data.csv b/application/src/main/resources/locale/material/odyssey/data.csv
@@ -121,9 +121,4 @@ material.data.poweremployeedata,Power Association Data,,,,,,
 material.data.powerfinancialrecords,Power Industrial Data,,,,,,
 material.data.powerpropagandadata,Power Political Data,,Politische Daten der Macht,,,,
 material.data.powerclassifieddata,Power Classified Data,,,,,,
-material.data.powersecurity,Security Logs,,,,,,
-material.data.powerpower,Energy Regulator,,,,,,
 material.data.powermegashipdata,Power Megaship Data,,,,,,
-material.data.electronicspackage,Electronics Package,,,,,,
-material.data.datastoragedevice,Data Storage Device,,,,,,
-material.data.researchnotes,Research Notes,,,,,,
diff --git a/application/src/main/resources/locale/material/odyssey/good.csv b/application/src/main/resources/locale/material/odyssey/good.csv
@@ -54,5 +54,9 @@ material.good.powercomputer,Computer Parts,,,,,,
 material.good.powerexperiment,Experiment Prototype,,,,,,
 material.good.poweragriculture,Agricultural Sample,,,,,,
 material.good.powerextraction,Extraction Sample,,,,,,
-material.good.powerprotectiveequipment,Personal protective Equipment,,,,,,
-material.good.powermedicalsample,Medical Sample,,,,,,
+material.good.powerequipment,Personal protective Equipment,,,,,,
+material.good.powermedical,Medical Sample,,,,,,
+material.good.powermisccomputer,Data Storage Device,,,,,,
+material.good.powersecurity,Security Logs,,,,,,
+material.good.powerpower,Energy Regulator,,,,,,
+material.good.powerresearch,Research Notes,,,,,,
diff --git a/application/src/main/resources/schemas/journal/FSSSignalDiscovered/FSSSignalDiscovered.json b/application/src/main/resources/schemas/journal/FSSSignalDiscovered/FSSSignalDiscovered.json
@@ -71,6 +71,12 @@
       "type" : "string",
       "examples" : [ "Archon Delaine" ]
     },
+    "OpposingPower" : {
+      "title" : "OpposingPower",
+      "description": "the opposing power, if relevant",
+      "type" : "string",
+      "examples" : [ "Archon Delaine" ]
+    },
     "ThreatLevel" : {
       "title" : "ThreatLevel",
       "description": "If a Unidentified Signal Source(USS) Event",