Merge branch 'master' of https://github.com/rderekp/The-Grand-Combo

.gitignore

@@ -51,6 +51,8 @@ AOE-exp/
 !TGC.mod
 
 # Submods
+!/TGCApocalypse1836
+!/TGCApocalypse1836.mod
 !/TGCHFMStyleCultureColors/
 !TGCHFMStyleCultureColors.mod
 !/TGCHFMMap/
@@ -65,12 +67,8 @@ AOE-exp/
 !TGCDirectImmigration.mod
 !/TGCPerformanceAddon/
 !TGCPerformanceAddon.mod
-<<<<<<< Updated upstream
 !/TGCStreamerMode/
 !TGCStreamerMode.mod
-=======
-TGCStatehoodMechanic.mod
->>>>>>> Stashed changes
 TGCStatehoodMechanic/localisation/00_statehood_mechanic.csv
 TGCStatehoodMechanic/localisation/00_decisions-states.csv
 TGCStatehoodMechanic/decisions/StateMechanic.txt

TGC/common/bookmarks.txt

@@ -5,4 +5,4 @@ bookmark =
 	date = 1836.1.1
 	cameraX = 3521
 	cameraY = 2252
-}
+}

TGC/common/cb_types.txt

@@ -8176,4 +8176,78 @@ status_quo = {
 	po_status_quo = yes
 
 	war_name = WAR_NAME
+}
+
+## Apocalypse 1836
+
+# Wasteland
+
+plague_spreader = {
+	sprite_index = 33
+	is_triggered_only = yes
+	constructing_cb = no
+
+	badboy_factor = 1
+	prestige_factor = 5
+	peace_cost_factor = 99
+	penalty_factor = 1
+
+	break_truce_prestige_factor = 5
+	break_truce_infamy_factor = 2
+	break_truce_militancy_factor = 2
+	truce_months = 0
+
+	good_relation_prestige_factor = 1
+	good_relation_infamy_factor = 1
+	good_relation_militancy_factor = 1
+
+	can_use = { }
+
+	po_remove_prestige = yes
+
+	tws_battle_factor = 2.0
+
+	war_name = WAR_HUMILIATE_NAME
+
+	on_add = {
+	}
+
+	on_po_accepted = {
+		prestige_factor = -0.5
+	}
+}
+
+plague_cleanse = {
+	sprite_index = 9
+	is_triggered_only = yes
+	constructing_cb = no
+
+	badboy_factor = 1
+	prestige_factor = 5
+	peace_cost_factor = 99
+	penalty_factor = 1
+
+	break_truce_prestige_factor = 5
+	break_truce_infamy_factor = 2
+	break_truce_militancy_factor = 2
+	truce_months = 0
+
+	good_relation_prestige_factor = 1
+	good_relation_infamy_factor = 1
+	good_relation_militancy_factor = 1
+
+	can_use = { }
+
+	po_remove_prestige = yes
+
+	tws_battle_factor = 2.0
+
+	war_name = PLAGUE_WAR
+
+	on_add = {
+	}
+
+	on_po_accepted = {
+		prestige_factor = -0.2
+	}
 }

TGC/common/countries.txt

@@ -9,6 +9,10 @@
 	U01		= "countries/Assimilation Manager.txt"
 	U02		= "countries/Statehood Manager.txt"
 
+### Apocalypse 1836 ###
+
+	ZOM 	= "countries/Zombie Wasteland.txt"
+
 ### Europe ###
 
 	## Balkans ##

TGC/common/countries/Zombie Wasteland.txt

@@ -0,0 +1,20 @@
+graphical_culture = Generic
+color = { 48  48  48 }
+
+unit_names = {
+}
+
+party = {
+	name = "undead_party"
+	start_date = 1800.1.1
+	end_date = 2000.1.1
+
+	ideology = reactionary
+
+	social_policy = no_position_set	
+	economic_policy = no_position_set	
+	trade_policy = no_position_set	
+	religious_policy = no_position_set	
+	citizenship_policy = no_position_set
+	war_policy = jingoism
+}

TGC/common/cultures.txt

@@ -2275,3 +2275,16 @@ bears = {
 		last_names = { Beliy Medved Bjorn Rawrrorr Rrrrr Grrr Gyp Qoi Styrbjorn Blomstfjellet }
 	}
 }
+
+## Apocalypse 1836
+undead = {
+	leader = undead_horde
+	unit = EuropeanGC
+
+	undead = {
+		color = { 48 48 48 }
+		first_names = { Nanuk Ursus Isbjorn Grrrowr Bjorn Grrgrrr Rawr Bamse }
+		last_names = { Beliy Medved Bjorn Rawrrorr Rrrrr Grrr Gyp Qoi Styrbjorn Blomstfjellet }
+	}
+
+}

TGC/common/event_modifiers.txt

@@ -5801,4 +5801,192 @@ bad_immigration_policy = {
 	assimilation_rate = -0.05
 	global_immigrant_attract = -0.40
 	icon = 32
-}
+}
+
+# Apocalypse 1836
+# Those Bonuses are balanced around the Apocalypse 1836 submod
+# using them in the base game would be extremely unwise
+
+ap_state_of_emergency = {
+	mobilisation_size = 0.1
+	land_organisation = 0.1
+	naval_organisation = 0.1
+	research_points_modifer = 0.2
+	org_regain = 0.2
+	tax_efficiency = 1
+	icon = 36
+}
+
+ap_state_of_emergency_abuse = {
+	pop_militancy_modifier = 0.05
+	pop_consciousness_modifier = 0.05
+	research_points_modifier = -0.5
+	tax_efficiency = -0.1
+	icon = 18
+}
+
+zombie_outbreak = {
+	immigrant_attract = -0.05
+	immigrant_push = 0.05
+	pop_consciousness_modifier = -0.3
+	pop_militancy_modifier = 2
+	population_growth = -0.05
+	icon = 39
+}
+
+do_not_annex = {
+	immigrant_attract = -0.001
+	icon = 20
+}
+
+accepts_new_provinces = {
+	immigrant_attract = -0.001
+	icon = 20
+}
+
+ap_lock_down_modifier = {
+	research_points_modifier = -0.2
+	import_cost = 0.9
+	global_immigrant_attract = -0.9
+	icon = 10
+}
+
+ap_quarantine_modifier = {
+	rgo_output = -0.3
+	factory_output = -0.3
+	icon = 10
+}
+
+ap_rebuild_society = {
+	population_growth = 0.01
+	icon = 9
+}
+
+ap_conservative_rebuild = {
+	population_growth = 0.02
+	rgo_output = 0.15
+	industry_tech_research_bonus = 0.2
+	commerce_tech_research_bonus = 0.2
+	culture_tech_research_bonus = 0.2
+	icon = 27
+}
+
+ap_temperace_rebuild = {
+	population_growth = 0.01
+	rgo_output = 0.1
+	culture_tech_research_bonus = 0.1
+	industry_tech_research_bonus = 0.1
+	commerce_tech_research_bonus = 0.1
+	army_tech_research_bonus = 0.1
+	navy_tech_research_bonus = 0.1
+	org_regain = 0.05
+	land_unit_start_experience = 2
+	icon = 27
+}
+
+ap_agressive_rebuild = {
+	population_growth = 0.005
+	rgo_output = 0.05
+	industry_tech_research_bonus = 0.05
+	army_tech_research_bonus = 0.2
+	navy_tech_research_bonus = 0.2
+	org_regain = 0.1
+	land_unit_start_experience = 5
+	mobilisation_economy_impact = -0.1
+	supply_consumption = -0.05
+	leadership_modifier = 0.1
+	mobilisation_size = 0.02
+	icon = 27
+}
+
+ap_ruins = {
+	immigrant_push = 10
+	icon = 34
+}
+
+ap_refuge = {
+	immigrant_attract = 10
+    icon = 33
+}
+
+ap_pop_boom = {
+    population_growth = 0.1
+	icon = 29
+}
+
+ap_zm_timer = {
+	icon = 19
+}
+
+ap_tn_timer = {
+	icon = 19
+}
+
+ap_expedition = {
+	immigrant_attract = 0.001
+	icon = 19
+}
+
+ap_plague_inc = {
+	global_pop_militancy_modifier = -2
+	global_pop_consciousness_modifier = -2
+	mobilisation_size = 1
+	mobilization_impact = 1
+	supply_consumption = -1
+	population_growth = -0.05
+	research_points_modifier = -1
+	leadership_modifier = 0.1
+	import_cost = 100
+	icon = 30
+}
+
+ap_desecreated_city_1 = {
+	leadership_modifier = 0.1
+	org_regain = 0.1
+	land_organisation = 0.1
+	icon = 37
+}
+
+ap_desecreated_city_2 = {
+	leadership_modifier = 0.2
+	org_regain = 0.2
+	land_organisation = 0.2
+	icon = 37
+}
+ap_desecreated_city_3 = {
+	leadership_modifier = 0.3
+	org_regain = 0.3
+	land_organisation = 0.3
+	icon = 37
+}
+ap_desecreated_city_4 = {
+	leadership_modifier = 0.4
+	org_regain = 0.4
+	land_organisation = 0.4
+	icon = 37
+}
+ap_desecreated_city_5 = {
+	leadership_modifier = 0.5
+	org_regain = 0.5
+	land_organisation = 0.5
+	icon = 37
+}
+
+ap_desecreated_city_5 = {
+	leadership_modifier = 0.5
+	org_regain = 0.5
+	land_organisation = 0.5
+	icon = 37
+}
+
+ap_countdown = {
+	icon = 20
+}
+
+sacrifice_cd = {
+	icon = 21
+}
+
+
+
+

TGC/common/religion.txt

@@ -113,4 +113,11 @@ pagan = {
 		color = { 0.5 0.0 0.0 }
 		pagan = yes
 	}
+
+	## Apocalypse 1836
+	faithless = {  
+		icon = 14
+		color = { 0.5 0.5 0.5 }
+		pagan = yes
+	}
 }

TGC/common/triggered_modifiers.txt

@@ -1248,3 +1248,12 @@ tribal_culture = {
 	prestige = 0.001
 }
 
+## Apocalypse 1836
+
+ap_zom_nerf = {
+	trigger = { tag = ZOM ai = yes }
+
+	research_points_modifier = -10
+	tax_efficiency = -10
+	import_cost = 10
+}