oops Sulphur and Silica were swapped!

NeDether · Nov 9, 2023 · dcb98f8 · dcb98f8
1 parent b4a0f7d
commit dcb98f8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/MiningBeam.cpp b/MiningBeam.cpp
@@ -36,15 +36,15 @@ bool MiningBeam:: OnHit(Simulator::cSpaceToolData* pTool, const Vector3& positio
             if ((Simulator::GetActivePlanetRecord()->mTemperatureScore) >= 0.75) {
                 SpaceTrading.ObtainTradingObject({ id("spice_drt_kamacite"), 0, 0 }, 1);
             }
-            else if ((Simulator::GetActivePlanetRecord()->mAtmosphereScore) <= 0.20) {
-                SpaceTrading.ObtainTradingObject({ id("spice_drt_sulphide"), 0, 0 }, 1);
-            }
             else if ((Simulator::GetActivePlanetRecord()->mTemperatureScore) <= 0.25) {
                 SpaceTrading.ObtainTradingObject({ id("spice_drt_ice"), 0, 0 }, 1);
             }
-            else if ((Simulator::GetActivePlanetRecord()->mAtmosphereScore) >= 0.90 ) {
+            else if ((Simulator::GetActivePlanetRecord()->mAtmosphereScore) <= 0.20) {
                 SpaceTrading.ObtainTradingObject({ id("spice_drt_silica"), 0, 0 }, 1);
             }
+            else if ((Simulator::GetActivePlanetRecord()->mAtmosphereScore) >= 0.90 ) {
+                SpaceTrading.ObtainTradingObject({ id("spice_drt_sulphide"), 0, 0 }, 1);
+            }
             else {
                 SpaceTrading.ObtainTradingObject({ id("spice_drt_carbon"), 0, 0 }, 1);
             }

diff --git a/SMFX/RattlerSpore/config.properties b/SMFX/RattlerSpore/config.properties
@@ -1,9 +1,9 @@
-#Thu Nov 09 11:07:18 EST 2023
+#Thu Nov 09 17:37:12 EST 2023
 lastTimeUsed=1699546038720
 isReadOnly=false
 sources="Spore (Game & Graphics)"
 packPathType=GALACTIC_ADVENTURES
 packPath=
 packageName=RattlerSpore.package
 embeddedEditorPackages=None
-showOnlyModded=false
+showOnlyModded=true
diff --git a/SMFX/RattlerSpore/spacetrading~/spice_drt_silica.prop.prop_t b/SMFX/RattlerSpore/spacetrading~/spice_drt_silica.prop.prop_t
@@ -3,16 +3,17 @@ float inventoryItemArtifactNormalScale 2
 float inventoryItemArtifactPlumpScale 2
 uint32 spaceEconomySpiceColor 0x00ffffff
 texts spaceToolDescription
-	(rattlercargo!0x00000013) "PLACEHOLDER"
+	(rattlercargo!0x00000015) "PLACEHOLDER"
 end
 texts spaceToolDetailDescription
-	(rattlercargo!0x00000014) "PLACEHOLDER"
+	(rattlercargo!0x00000016) "PLACEHOLDER"
 end
+
 uint32s spaceToolImageColors
 	0xffffffff
 end
 key spaceToolImageID ufotools~!spg_cargopas_mineral.png
-float spaceTradingBaseCost 323
+float spaceTradingBaseCost 3376
 float spaceTradingChanceBlueEasy 0.0
 float spaceTradingChanceBlueHard 0.0
 float spaceTradingChanceRedEasy 0.0

diff --git a/SMFX/RattlerSpore/spacetrading~/spice_drt_sulphide.prop.prop_t b/SMFX/RattlerSpore/spacetrading~/spice_drt_sulphide.prop.prop_t
@@ -3,16 +3,16 @@ float inventoryItemArtifactNormalScale 2
 float inventoryItemArtifactPlumpScale 2
 uint32 spaceEconomySpiceColor 0x00ffff00
 texts spaceToolDescription
-	(rattlercargo!0x00000015) "PLACEHOLDER"
+	(rattlercargo!0x00000013) "PLACEHOLDER"
 end
 texts spaceToolDetailDescription
-	(rattlercargo!0x00000016) "PLACEHOLDER"
+	(rattlercargo!0x00000014) "PLACEHOLDER"
 end
 uint32s spaceToolImageColors
 	0xffffff00
 end
 key spaceToolImageID ufotools~!spg_cargopas_mineral.png
-float spaceTradingBaseCost 3376
+float spaceTradingBaseCost 3178
 float spaceTradingChanceBlueEasy 0.0
 float spaceTradingChanceBlueHard 0.0
 float spaceTradingChanceRedEasy 0.0

diff --git a/SMFX/RattlerSpore/spacetrading~/spice_mat_copper.prop.prop_t b/SMFX/RattlerSpore/spacetrading~/spice_mat_copper.prop.prop_t
@@ -26,3 +26,4 @@ texts spaceTradingNoNeed
 	(rattlercargo!0x00000004) "Please take a look at our fine goods available."
 end
 key spaceTradingType spice
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ texts spaceTradingNoNeed
		(rattlercargo!0x00000004) "Please take a look at our fine goods available."
		end
		key spaceTradingType spice