Merge pull request #12 from rheirman/Sarg

v1.1 Update
rheirman · Feb 28, 2020 · ac9c800 · ac9c800
2 parents 318935c + 1a27f9e
commit ac9c800
Show file tree

Hide file tree

Showing 57 changed files with 19,958 additions and 2 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,8 +2,26 @@
 <ModMetaData>
 	<name>Giddy-up! Caravan</name>
 	<author>Roolo</author>
-	<targetVersion>1.0.0</targetVersion>
-	<description>Let your colonists ride to far lands on elephants, muffalos, lamas or any other animal, modded or not! 
+	<supportedVersions>
+      <li>1.0</li>
+      <li>1.1</li>
+   </supportedVersions>
+	<modDependencies>
+      <li>
+        <packageId>UnlimitedHugs.HugsLib</packageId>
+        <displayName>HugsLib</displayName>
+        <steamWorkshopUrl>https://steamcommunity.com/sharedfiles/filedetails/?id=818773962</steamWorkshopUrl>
+      </li>
+	  <li>
+        <packageId>roolo.giddyupcore</packageId>
+        <displayName>Giddy-up! Core</displayName>
+        <steamWorkshopUrl>https://steamcommunity.com/sharedfiles/filedetails/?id=1216999901</steamWorkshopUrl>
+      </li>
+
+    </modDependencies>
+
+		<packageId>roolo.giddyupcaravan</packageId>
+	<description>Let your colonists ride to far lands on elephants, muffalos, llamas or any other animal, modded or not! 
 
 &lt;color=orange&gt;&lt;b&gt;Dependencies &lt;/b&gt;&lt;/color&gt;
 This mod depends on Giddy-up! Core, and Hugslib. Load order should be: Hugslib -> Giddy-up! Core -> Giddy-up! Caravan. Also make sure Giddy-up! Core is up to date. 

diff --git a/LoadFolders.xml b/LoadFolders.xml
@@ -0,0 +1,6 @@
+<loadFolders>
+  <v1.1>
+    <li>/</li>
+    <li>v1.1</li>
+  </v1.1>
+</loadFolders>
diff --git a/v1.1/Assemblies/0Harmony.dll b/v1.1/Assemblies/0Harmony.dll
diff --git a/v1.1/Assemblies/0Harmony.xml b/v1.1/Assemblies/0Harmony.xml
diff --git a/v1.1/Assemblies/GiddyUpCaravan.dll b/v1.1/Assemblies/GiddyUpCaravan.dll
diff --git a/v1.1/Source/Giddy-up-Caravan/Base.cs b/v1.1/Source/Giddy-up-Caravan/Base.cs
@@ -0,0 +1,62 @@
+using GiddyUpCore.Storage;
+using HugsLib;
+using HugsLib.Settings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Verse;
+using static RimWorld.Planet.CaravanTicksPerMoveUtility;
+
+namespace GiddyUpCaravan
+{
+    public class Base : ModBase
+    {
+        internal const string DropAnimal_NPC_LABEL = "GU_Car_Area_GU_DropAnimal_NPC";
+
+        internal static SettingHandle<int> completeCaravanBonus;
+        internal static SettingHandle<int> incompleteCaravanBonusCap;
+
+        internal static SettingHandle<int> visitorMountChance;
+        internal static SettingHandle<int> visitorMountChanceTribal;
+
+        internal static SettingHandle<int> inBiomeWeight;
+        internal static SettingHandle<int> outBiomeWeight;
+        internal static SettingHandle<int> nonWildWeight;
+
+        internal List<Pawn> curCaravanPawns;
+
+        private int minPercentage = 0;
+        private int maxPercentage = 100;
+        public static Base Instance { get; private set; }
+
+        public Base()
+        {
+            Instance = this;
+        }
+        public override string ModIdentifier
+        {
+            get { return "GiddyUpCaravan"; }
+        }
+
+        public static ExtendedDataStorage GetExtendedDataStorage()
+        {
+            return GiddyUpCore.Base.Instance.GetExtendedDataStorage();
+        }
+        public override void DefsLoaded()
+        {
+            completeCaravanBonus = Settings.GetHandle<int>("completeCaravanBonus", "GU_Car_CompleteCaravanBonus_Title".Translate(), "GU_Car_CompleteCaravanBonus_Description".Translate(), 60, Validators.IntRangeValidator(0, 200));
+            incompleteCaravanBonusCap = Settings.GetHandle<int>("incompleteCaravanBonusCap", "GU_Car_incompleteCaravanBonusCap_Title".Translate(), "GU_Car_incompleteCaravanBonusCap_Description".Translate(), 25, Validators.IntRangeValidator(0, 200));
+
+            visitorMountChance = Settings.GetHandle<int>("visitorMountChance", "GU_Car_visitorMountChance_Title".Translate(), "GU_Car_visitorMountChance_Description".Translate(), 20, Validators.IntRangeValidator(minPercentage, maxPercentage));
+            visitorMountChanceTribal = Settings.GetHandle<int>("visitorMountChanceTribal", "GU_Car_visitorMountChanceTribal_Title".Translate(), "GU_Car_visitorMountChanceTribal_Description".Translate(), 40, Validators.IntRangeValidator(minPercentage, maxPercentage));
+
+            inBiomeWeight = Settings.GetHandle<int>("inBiomeWeight", "GU_Car_InBiomeWeight_Title".Translate(), "GU_Car_InBiomeWeight_Description".Translate(), 70, Validators.IntRangeValidator(minPercentage, maxPercentage));
+            outBiomeWeight = Settings.GetHandle<int>("outBiomeWeight", "GU_Car_OutBiomeWeight_Title".Translate(), "GU_Car_OutBiomeWeight_Description".Translate(), 15, Validators.IntRangeValidator(minPercentage, maxPercentage));
+            nonWildWeight = Settings.GetHandle<int>("nonWildWeight", "GU_Car_NonWildWeight_Title".Translate(), "GU_Car_NonWildWeight_Description".Translate(), 15, Validators.IntRangeValidator(minPercentage, maxPercentage));
+
+        }
+    }
+
+
+}