Merge pull request #54 from VeteranXT/fixes/marketValue

Fixes Default value that matches script #52
alaestor · May 13, 2023 · 8c12d4a · 8c12d4a
2 parents a83f07d + ce6525b
commit 8c12d4a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 142 deletions.
diff --git a/Source/Mod/ModSettings/MiscPlusPlusSettings.cs b/Source/Mod/ModSettings/MiscPlusPlusSettings.cs
@@ -30,7 +30,7 @@ public class MiscPlusPlusSettings : ModSettings
         //Contains list of all bots by DefName
         //Remember to keep same names as in XML files
         //It throws error if it does not match
-        #region Def Names
+        #region Def Robot Names
         private static readonly string[] cleanerList = new string[5] { "AIRobot_Cleaner", "AIRobot_Cleaner_II", "AIRobot_Cleaner_III", "AIRobot_Cleaner_IV", "AIRobot_Cleaner_V" };
         private static readonly string[] crafterList = new string[5] { "RPP_Bot_Crafter_I", "RPP_Bot_Crafter_II", "RPP_Bot_Crafter_III", "RPP_Bot_Crafter_IV", "RPP_Bot_Crafter_V" };
         private static readonly string[] kitchenList = new string[5] { "RPP_Bot_Kitchen_I", "RPP_Bot_Kitchen_II", "RPP_Bot_Kitchen_III", "RPP_Bot_Kitchen_IV", "RPP_Bot_Kitchen_V" };
@@ -49,20 +49,20 @@ public class MiscPlusPlusSettings : ModSettings
 
         private readonly static float[,] cleanerDefaultSettings = new float[5, 2] {
 
-                { 1f, 1000  },
-                { 2f, 2000  },
-                { 2.5f, 3500  },
-                { 3f, 7000  },
-                { 4f, 9000  }
+                { 1f, 1500  },
+                { 2f, 1500  },
+                { 2.5f, 1500  },
+                { 3f, 1500  },
+                { 4f, 1500  }
 
         };
         private static float[,] cleanerSettings = new float[5, 2] {
 
-                { 1f, 1000  },
-                { 2f, 2000  },
-                { 2.5f, 3500  },
-                { 3f, 7000  },
-                { 4f, 9000  }
+                { 1f, 1500  },
+                { 2f, 1500  },
+                { 2.5f, 1500  },
+                { 3f, 1500  },
+                { 4f, 1500  }
 
         };
 
@@ -233,7 +233,8 @@ public class MiscPlusPlusSettings : ModSettings
 
         #endregion
 
-        #endregion
+
+        #region Robots Data
 
         private static RobotsData cleanerData = new RobotsData(cleanerList, cleanerStats, cleanerSettings, CleanerisPrecent);
         private static RobotsData crafterData = new RobotsData(crafterList, crafterStats, crafterSettings,crafterIsPrecent);
@@ -242,6 +243,10 @@ public class MiscPlusPlusSettings : ModSettings
         private static RobotsData eRData = new RobotsData(ERList, ERStats, ERSettings,eRIsPrecent);
         private static RobotsData omniData = new RobotsData(omniList, OmniStats, OmniSettings, OmniPrecent);
 
+        #endregion
+
+        #endregion
+
         #region Stations Data
         private static bool[,] GeneralStationIsPrecent = new bool[5, 2]
         {
@@ -512,7 +517,7 @@ public static void DoOptionsCategoryContents(Listing_Standard listing_Standard)
                     RobotsSettings(listing_Standard);
                     break;
                 case SettingsPages.Station_Tweaks:
-                    RobotsStationSettings(listing_Standard);
+                    //RobotsStationSettings(listing_Standard);
                     break;
                 default:
                     break;
@@ -556,7 +561,6 @@ private static void RobotsSettings(Listing_Standard listing_Standard)
                 RobotsData.DrawingSettings(listing_Standard, omniData);
             }
         }
-
         private static void RobotsStationSettings(Listing_Standard listing_Standard)
         {
             listing_Standard.Label("These settings apply After Reset");

diff --git a/v1.4/Defs/ThingDefs/RPP_Buildings_RechargeStation.xml b/v1.4/Defs/ThingDefs/RPP_Buildings_RechargeStation.xml
@@ -19,7 +19,7 @@
 	<ThingDef Abstract="True" Name="RPP_RechargeStation_I" ParentName="RPP_RechargeStation" Class="AIRobot.X2_ThingDef_AIRobot_Building_RechargeStation">
 		<statBases>
 			<Beauty>0</Beauty>
-			<MarketValue>501</MarketValue>
+			<MarketValue>1050</MarketValue>
 			<Flammability>1.0</Flammability>
 		</statBases>
 		<costList>
@@ -37,7 +37,7 @@
 	<ThingDef Abstract="True" Name="RPP_RechargeStation_II" ParentName="RPP_RechargeStation" Class="AIRobot.X2_ThingDef_AIRobot_Building_RechargeStation">
 		<statBases>
 			<Beauty>1</Beauty>
-			<MarketValue>1236</MarketValue>
+			<MarketValue>1900</MarketValue>
 			<Flammability>0.8</Flammability>
 		</statBases>
 		<costList>
@@ -55,7 +55,7 @@
 	<ThingDef Abstract="True" Name="RPP_RechargeStation_III" ParentName="RPP_RechargeStation" Class="AIRobot.X2_ThingDef_AIRobot_Building_RechargeStation">
 		<statBases>
 			<Beauty>2</Beauty>
-			<MarketValue>2720</MarketValue>
+			<MarketValue>5000</MarketValue>
 			<Flammability>0.5</Flammability>
 		</statBases>
 		<costList>
@@ -73,7 +73,7 @@
 	<ThingDef Abstract="True" Name="RPP_RechargeStation_IV" ParentName="RPP_RechargeStation" Class="AIRobot.X2_ThingDef_AIRobot_Building_RechargeStation">
 		<statBases>
 			<Beauty>5</Beauty>
-			<MarketValue>5650</MarketValue>
+			<MarketValue>11250</MarketValue>
 			<Flammability>0.2</Flammability>
 		</statBases>
 		<costList>
@@ -91,7 +91,7 @@
 	<ThingDef Abstract="True" Name="RPP_RechargeStation_V" ParentName="RPP_RechargeStation" Class="AIRobot.X2_ThingDef_AIRobot_Building_RechargeStation">
 		<statBases>
 			<Beauty>20</Beauty>
-			<MarketValue>11455</MarketValue>
+			<MarketValue>26250</MarketValue>
 			<Flammability>0.0</Flammability>
 		</statBases>
 		<costList>