Merge tag '8.2.1' from deassimilate-machines/master

corsairmarks · Apr 28, 2023 · bdcd7ca · bdcd7ca
2 parents 74b692d + ed92fe9
commit bdcd7ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/assets/steam-description.txt b/assets/steam-description.txt
@@ -23,7 +23,7 @@ This is a bundle of mods to resolve compatibility issues if you want to use them
 [*][url=https://steamcommunity.com/workshop/filedetails/?id=2597129991]Colony Designation: Ecumenopolis Commercial[/url] at 7.0.0
 [*][url=https://steamcommunity.com/workshop/filedetails/?id=2773995755]Colony Designations: Capitol Building Job Swaps[/url] at 5.0.0
 [*][url=https://steamcommunity.com/workshop/filedetails/?id=2564348666]Counter-Limited Armies Fix[/url] at 5.1.0
-[*][url=https://steamcommunity.com/workshop/filedetails/?id=2553812372]Deassimilate Machines[/url] at 8.2.0
+[*][url=https://steamcommunity.com/workshop/filedetails/?id=2553812372]Deassimilate Machines[/url] at 8.2.1
 [*][url=https://steamcommunity.com/workshop/filedetails/?id=2559702143]Deassimilated Machine Worlds[/url] at 7.1.0
 [*][url=https://steamcommunity.com/workshop/filedetails/?id=2641081470]Enhanced Trade Districts and Designations[/url] at 6.0.2
 [*][url=https://steamcommunity.com/workshop/filedetails/?id=2775465389]Game Start: Unity Fund[/url] at 3.0.0

diff --git a/mod/README.md b/mod/README.md
@@ -26,7 +26,7 @@ This is a bundle of mods to resolve compatibility issues if you want to use them
 * [Colony Designation: Ecumenopolis Commercial](https://steamcommunity.com/workshop/filedetails/?id=2597129991) ([Source](url=https://github.com/corsairmarks/ecumenopolis_trade) 7.0.0)
 * [Colony Designations: Capitol Building Job Swaps](https://steamcommunity.com/workshop/filedetails/?id=2773995755) ([Source](https://github.com/corsairmarks/building_capital_colony_type_job_swaps) 5.0.0)
 * [Counter-Limited Armies Fix](https://steamcommunity.com/workshop/filedetails/?id=2564348666) ([Source](https://github.com/corsairmarks/limited_army_counter_fix) 5.1.0)
-* [Deassimilate Machines](https://steamcommunity.com/workshop/filedetails/?id=2553812372) ([Source](https://github.com/corsairmarks/deassimilate_machines) 8.2.0)
+* [Deassimilate Machines](https://steamcommunity.com/workshop/filedetails/?id=2553812372) ([Source](https://github.com/corsairmarks/deassimilate_machines) 8.2.1)
 * [Deassimilated Machine Worlds](https://steamcommunity.com/workshop/filedetails/?id=2559702143) ([Source](https://github.com/corsairmarks/deassimilated_machine_worlds) 7.1.0)
 * [Enhanced Trade Districts and Designations](https://steamcommunity.com/workshop/filedetails/?id=2641081470) ([Source](https://github.com/corsairmarks/trade_district_enhancements) 6.0.2)
 * [Game Start: Unity Fund](https://steamcommunity.com/workshop/filedetails/?id=2775465389) ([Source](https://github.com/corsairmarks/start_with_unity_fund) 3.0.0)
@@ -242,4 +242,5 @@ This mod should not be removed from your save game. Some added modifiers and tec
 	* Deassimilate Machines at 8.2.0
 	* Retain Leaders from Integrated Subjects & Pre-FTL Civilizations at 8.1.0
 * 8.0.3 Update merged mods:
+	* Deassimilate Machines at 8.2.1
 	* Enhanced Trade Districts and Designations at 6.0.2
diff --git a/mod/common/scripted_triggers/deassimilate_machines_scripted_triggers.txt b/mod/common/scripted_triggers/deassimilate_machines_scripted_triggers.txt
@@ -18,6 +18,7 @@ has_ai_and_knows_machines = {
 # prev = country (assimilator)
 dm_is_undergoing_assimilation_unmachine_species = {
 	optimize_memory
+	count_species_pop = { count > 0 }
 	has_living_standard = {
 		type = living_standard_deassimilation_machine
 		country = prev