diff --git a/1.5/Assemblies/RimBees.dll b/1.5/Assemblies/RimBees.dll index 062ad96..424ce2f 100644 Binary files a/1.5/Assemblies/RimBees.dll and b/1.5/Assemblies/RimBees.dll differ diff --git a/1.5/Defs/AchievementDefs/Achievements.xml b/1.5/Defs/AchievementDefs/Achievements.xml new file mode 100644 index 0000000..a59dfa3 --- /dev/null +++ b/1.5/Defs/AchievementDefs/Achievements.xml @@ -0,0 +1,304 @@ + + + + RB_Achievements + + + + Achievements/RB_AchievementBackground + RB_Achievements + + + RB_HumbleBeeginnings + + Harvest your first wild beehive + + +
  • + RB_WildHive_Temperate + 1 +
    • +
  • + RB_WildHive_Mild + 1 +
    • +     + +     + Achievements/RB_HumbleBeeginnings + 5 +     + + RB_AchievementBeehouse + + Build your first Beehouse + + RB_Beehouse + 1 + + Achievements/RB_AchievementBeehouse + 10 + + + RB_AchievementFiveBeehouse + + Build five basic Beehouses + + RB_Beehouse + 5 + + Achievements/RB_AchievementFiveBeehouse + 15 + + + RB_AchievementBeeMansion + + Research Advanced Climatization + + RB_AdvancedClimatization + + Achievements/RB_AchievementBeeMansion + 10 + + + RB_AchievementFirstHybrid + + Create your first hybrid bee + + RB_Bee_Hybrid_Queen + 1 + + Achievements/RB_AchievementFirstHybrid + 10 + + + RB_AchievementBiomeBranch + + Get an Adaptive Queen to start with the Biome Branch + + RB_Bee_Adaptive_Queen + 1 + + Achievements/RB_AchievementBiomeBranch + 10 + + + RB_AchievementMinerBranch + + Get an Alloy Queen to start with the Miner Branch + + RB_Bee_Alloy_Queen + 1 + + Achievements/RB_AchievementMinerBranch + 10 + + + RB_AchievementDrugsBranch + + Get a Neutro Queen to start with the Drugs Branch + + RB_Bee_Neutro_Queen + 1 + + Achievements/RB_AchievementDrugsBranch + 10 + + + RB_AchievementNutritionBranch + + Get a Nutritious Queen to start with the Nutrition Branch + + RB_Bee_Nutritious_Queen + 1 + + Achievements/RB_AchievementNutritionBranch + 10 + + + RB_AchievementTechBranch + + Get a Technological Queen to start with the Tech Branch + + RB_Bee_Technological_Queen + 1 + + Achievements/RB_AchievementTechBranch + 10 + + + RB_Achievement_Chef_Queen + + Get a tier 5 Chef queen + + RB_Bee_Chef_Queen + 1 + + Achievements/RB_Achievement_Chef_Queen + 25 + + + RB_Achievement_Hyper_Queen + + Get a tier 5 Hyper queen + + RB_Bee_Hyper_Queen + 1 + + Achievements/RB_Achievement_Hyper_Queen + 25 + + + RB_Achievement_Lucifer_Queen + + Get a tier 5 Lucifer queen + + RB_Bee_Lucifer_Queen + 1 + + Achievements/RB_Achievement_Lucifer_Queen + 25 + + + RB_Achievement_Nitro_Queen + + Get a tier 5 Nitro queen + + RB_Bee_Nitro_Queen + 1 + + Achievements/RB_Achievement_Nitro_Queen + 25 + + + RB_Achievement_Surgeon_Queen + + Get a tier 5 Surgeon queen + + RB_Bee_Surgeon_Queen + 1 + + Achievements/RB_Achievement_Surgeon_Queen + 25 + + + RB_AchievementBioOrganic + + Process 10 Technological combs to get bio-components + + RB_ComponentBioInterface + 10 + + Achievements/RB_AchievementBioOrganic + 15 + + + RB_AchievementHoneyMeals + + Individually craft 10 Lavish honey meals + + RB_LavishHoney + 10 + + Achievements/RB_AchievementHoneyMeals + 15 + + + RB_AchievementHoneyTreat + + Have a pawn consume a honeyed ice pop + + RB_AteHoneyedIcePop + 1 + + Achievements/RB_AchievementHoneyTreat + 10 + + + RB_AchievementTwoBlackCandles + + Build two candles with black beeswax + + RB_WaxCandle + RB_BlackBeeswax + 2 + + Achievements/RB_AchievementTwoBlackCandles + 15 + + + RB_AchievementNotSturdiestTrap + + Build a spike trap out of Brittle beeswax + + TrapSpike + RB_Brittlewax + 1 + + Achievements/RB_AchievementNotSturdiestTrap + 10 + + + RB_AchievementWaxBaron + + Earn 2000 silver selling beeswax to settlements + + RB_Beeswax + 2000 + false + + Achievements/RB_AchievementWaxBaron + 40 + + + RB_AchievementHoneyFactory + + Stockpile a total of 500 regular honey + + RB_BaseHoney + 500 + + Achievements/RB_AchievementHoneyFactory + 25 + + + RB_AchievementRimMeadery + + Turn honey into 100 Mead bottles + + RB_Mead + 100 + + Achievements/RB_AchievementRimMeadery + 25 + + + RB_AchievementBestBefore + + Preserve 250 pieces of meat using honey + + RB_HoneyPreservedMeat + 250 + + Achievements/RB_AchievementBestBefore + 15 + + + RB_AchievementPursuingTenure + + Use research papers to discover a new bee combination + + RB_RecentlyResearched + 1 + + Achievements/RB_AchievementPursuingTenure + 15 + + + RB_BeeCargoPodsReward + + 50 + RB_ResourcePodCrash + +     + diff --git a/1.5/Patches/AchievementsPatch.xml b/1.5/Patches/AchievementsPatch.xml deleted file mode 100644 index 9e5a9d1..0000000 --- a/1.5/Patches/AchievementsPatch.xml +++ /dev/null @@ -1,374 +0,0 @@ - - - - - - -
  • Vanilla Achievements Expanded
    • -     - - - - - -
  • - /Defs - - - - RB_Achievements - - - - - Achievements/RB_AchievementBackground - RB_Achievements - - - - - RB_HumbleBeeginnings - - Harvest your first wild beehive - - -
  • - RB_WildHive_Temperate - 1 -
    • -
  • - RB_WildHive_Mild - 1 -
    • - - - Achievements/RB_HumbleBeeginnings - 5 - - - - RB_AchievementBeehouse - - Build your first Beehouse - - RB_Beehouse - 1 - - Achievements/RB_AchievementBeehouse - 10 - - - - RB_AchievementFiveBeehouse - - Build five basic Beehouses - - RB_Beehouse - 5 - - Achievements/RB_AchievementFiveBeehouse - 15 - - - - RB_AchievementBeeMansion - - Research Advanced Climatization - - - RB_AdvancedClimatization - - - Achievements/RB_AchievementBeeMansion - 10 - - - - RB_AchievementFirstHybrid - - Create your first hybrid bee - - RB_Bee_Hybrid_Queen - 1 - - Achievements/RB_AchievementFirstHybrid - 10 - - - - RB_AchievementBiomeBranch - - Get an Adaptive Queen to start with the Biome Branch - - RB_Bee_Adaptive_Queen - 1 - - Achievements/RB_AchievementBiomeBranch - 10 - - - - RB_AchievementMinerBranch - - Get an Alloy Queen to start with the Miner Branch - - RB_Bee_Alloy_Queen - 1 - - Achievements/RB_AchievementMinerBranch - 10 - - - - RB_AchievementDrugsBranch - - Get a Neutro Queen to start with the Drugs Branch - - RB_Bee_Neutro_Queen - 1 - - Achievements/RB_AchievementDrugsBranch - 10 - - - - RB_AchievementNutritionBranch - - Get a Nutritious Queen to start with the Nutrition Branch - - RB_Bee_Nutritious_Queen - 1 - - Achievements/RB_AchievementNutritionBranch - 10 - - - - RB_AchievementTechBranch - - Get a Technological Queen to start with the Tech Branch - - RB_Bee_Technological_Queen - 1 - - Achievements/RB_AchievementTechBranch - 10 - - - - RB_Achievement_Chef_Queen - - Get a tier 5 Chef queen - - RB_Bee_Chef_Queen - 1 - - Achievements/RB_Achievement_Chef_Queen - 25 - - - - RB_Achievement_Hyper_Queen - - Get a tier 5 Hyper queen - - RB_Bee_Hyper_Queen - 1 - - Achievements/RB_Achievement_Hyper_Queen - 25 - - - - RB_Achievement_Lucifer_Queen - - Get a tier 5 Lucifer queen - - RB_Bee_Lucifer_Queen - 1 - - Achievements/RB_Achievement_Lucifer_Queen - 25 - - - - RB_Achievement_Nitro_Queen - - Get a tier 5 Nitro queen - - RB_Bee_Nitro_Queen - 1 - - Achievements/RB_Achievement_Nitro_Queen - 25 - - - - RB_Achievement_Surgeon_Queen - - Get a tier 5 Surgeon queen - - RB_Bee_Surgeon_Queen - 1 - - Achievements/RB_Achievement_Surgeon_Queen - 25 - - - - RB_AchievementBioOrganic - - Process 10 Technological combs to get bio-components - - - RB_ComponentBioInterface - - 10 - - - Achievements/RB_AchievementBioOrganic - 15 - - - - RB_AchievementHoneyMeals - - Individually craft 10 Lavish honey meals - - - RB_LavishHoney - - 10 - - - Achievements/RB_AchievementHoneyMeals - 15 - - - - RB_AchievementHoneyTreat - - Have a pawn consume a honeyed ice pop - - RB_AteHoneyedIcePop - 1 - - - Achievements/RB_AchievementHoneyTreat - 10 - - - - RB_AchievementTwoBlackCandles - - Build two candles with black beeswax - - RB_WaxCandle - RB_BlackBeeswax - 2 - - Achievements/RB_AchievementTwoBlackCandles - 15 - - - - RB_AchievementNotSturdiestTrap - - Build a spike trap out of Brittle beeswax - - TrapSpike - RB_Brittlewax - 1 - - Achievements/RB_AchievementNotSturdiestTrap - 10 - - - - RB_AchievementWaxBaron - - Earn 2000 silver selling beeswax to settlements - - - RB_Beeswax - 2000 - false - - - Achievements/RB_AchievementWaxBaron - 40 - - - - RB_AchievementHoneyFactory - - Stockpile a total of 500 regular honey - - RB_BaseHoney - 500 - - Achievements/RB_AchievementHoneyFactory - 25 - - - - RB_AchievementRimMeadery - - Turn honey into 100 Mead bottles - - RB_Mead - 100 - - Achievements/RB_AchievementRimMeadery - 25 - - - - RB_AchievementBestBefore - - Preserve 250 pieces of meat using honey - - - RB_HoneyPreservedMeat - - 250 - - - Achievements/RB_AchievementBestBefore - 15 - - - - RB_AchievementPursuingTenure - - Use research papers to discover a new bee combination - - RB_RecentlyResearched - 1 - - - Achievements/RB_AchievementPursuingTenure - 15 - - - - - RB_BeeCargoPodsReward - - - 50 - RB_ResourcePodCrash - - - - - - - -     -     -     - - -     - diff --git a/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/13f26654-21dd-489b-ae12-72233fc1b797.vsidx b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/13f26654-21dd-489b-ae12-72233fc1b797.vsidx new file mode 100644 index 0000000..f27db2f Binary files /dev/null and b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/13f26654-21dd-489b-ae12-72233fc1b797.vsidx differ diff --git a/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/6ba7f6f3-0983-4049-a9a0-a5320fd061c2.vsidx b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/6ba7f6f3-0983-4049-a9a0-a5320fd061c2.vsidx new file mode 100644 index 0000000..ffcb7e5 Binary files /dev/null and b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/6ba7f6f3-0983-4049-a9a0-a5320fd061c2.vsidx differ diff --git a/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/e63e266c-735f-41fe-b6a2-455c141c70d1.vsidx b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/e63e266c-735f-41fe-b6a2-455c141c70d1.vsidx new file mode 100644 index 0000000..e4a5480 Binary files /dev/null and b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/e63e266c-735f-41fe-b6a2-455c141c70d1.vsidx differ diff --git a/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/e84d1568-308f-419d-b368-b1efc6f01b63.vsidx b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/e84d1568-308f-419d-b368-b1efc6f01b63.vsidx new file mode 100644 index 0000000..5232eeb Binary files /dev/null and b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/e84d1568-308f-419d-b368-b1efc6f01b63.vsidx differ diff --git a/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/read.lock b/1.5/Source/RimBees/.vs/RimBees/FileContentIndex/read.lock new file mode 100644 index 0000000..e69de29 diff --git a/1.5/Source/RimBees/.vs/RimBees/v17/.suo b/1.5/Source/RimBees/.vs/RimBees/v17/.suo index 64778ee..1d76a1c 100644 Binary files a/1.5/Source/RimBees/.vs/RimBees/v17/.suo and b/1.5/Source/RimBees/.vs/RimBees/v17/.suo differ diff --git a/1.5/Source/RimBees/RimBees/Achievements/ItemTrackerMultiple.cs b/1.5/Source/RimBees/RimBees/Achievements/ItemTrackerMultiple.cs deleted file mode 100644 index d01e17d..0000000 --- a/1.5/Source/RimBees/RimBees/Achievements/ItemTrackerMultiple.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Linq; -using HarmonyLib; -using Verse; -using RimWorld; - -namespace AchievementsExpanded -{ - /* public class ItemTrackerMultiple:ItemTracker - { - - - public ItemTrackerMultiple() - { - } - - public ItemTrackerMultiple(ItemTrackerMultiple reference) : base(reference) - { - thingList = reference.thingList; - - } - - public override void ExposeData() - { - base.ExposeData(); - Scribe_Collections.Look(ref thingList, "thingList", LookMode.Def, LookMode.Value); - - } - - public override bool Trigger() - { - bool playerHasIt = false; - foreach (KeyValuePair set in thingList) - { - playerHasIt = UtilityMethods.PlayerHas(set.Key, out int total, count); - if (playerHasIt) { break; } - } - return playerHasIt; - } - - Dictionary thingList = new Dictionary(); - }*/ -} diff --git a/1.5/Source/RimBees/RimBees/Harmony/HarmonyPatchers.cs b/1.5/Source/RimBees/RimBees/Harmony/HarmonyPatchers.cs index 37abef9..8781e4e 100644 --- a/1.5/Source/RimBees/RimBees/Harmony/HarmonyPatchers.cs +++ b/1.5/Source/RimBees/RimBees/Harmony/HarmonyPatchers.cs @@ -7,7 +7,7 @@ using System.Linq; using System; -// So, let's comment this code, since it uses Harmony and has moderate complexity + namespace RimBees { diff --git a/1.5/Source/RimBees/RimBees/RimBees.csproj b/1.5/Source/RimBees/RimBees/RimBees.csproj index 76f5f58..80be781 100644 --- a/1.5/Source/RimBees/RimBees/RimBees.csproj +++ b/1.5/Source/RimBees/RimBees/RimBees.csproj @@ -294,7 +294,6 @@ - diff --git a/1.5/Source/RimBees/RimBees/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/1.5/Source/RimBees/RimBees/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 828a442..bb08182 100644 Binary files a/1.5/Source/RimBees/RimBees/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/1.5/Source/RimBees/RimBees/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.AssemblyReference.cache b/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.AssemblyReference.cache index 2f3322c..3773f8b 100644 Binary files a/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.AssemblyReference.cache and b/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.AssemblyReference.cache differ diff --git a/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.CoreCompileInputs.cache b/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.CoreCompileInputs.cache index 9698672..60886ec 100644 --- a/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.CoreCompileInputs.cache +++ b/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3459eaf0c429454e3dd097ae980b10d1011c7a44 +3a23918d8c0f01104f376bc34a1596fe32153be0 diff --git a/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.dll b/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.dll index 062ad96..424ce2f 100644 Binary files a/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.dll and b/1.5/Source/RimBees/RimBees/obj/Debug/RimBees.dll differ