Merge pull request #55 from arkhometha/Development

Development

HPM/common/countries/Australia.txt

@@ -42,7 +42,7 @@ party = {
 	economic_policy = state_capitalism
 	trade_policy = protectionism
 	religious_policy = secularized
-	citizenship_policy = limited_citizenship
+	citizenship_policy = full_citizenship
 	war_policy = anti_military
 }
 

HPM/events/Greater Germany.txt

@@ -135,10 +135,24 @@ country_event = {
 		badboy = 20
 		all_core = {
 			limit = {
-				NOT = { is_core = HUN }
+				OR = {
+					NOT = { is_core = HUN }
+					province_id = 624
+					province_id = 778
+				}
 			}
 			add_core = GER
 		}
+		any_owned = {
+			limit = {
+				is_core = HUN
+				OR = {
+					province_id = 624
+					province_id = 778
+				}
+			}
+			remove_core = HUN
+		}	
 		any_pop = {
 			limit = {
 				is_primary_culture = no
@@ -230,10 +244,24 @@ country_event = {
 		badboy = 10
 		all_core = {
 			limit = {
-				NOT = { is_core = HUN }
+				OR = {
+					NOT = { is_core = HUN }
+					province_id = 624
+					province_id = 778
+				}
 			}
 			add_core = GER
 		}
+		any_owned = {
+			limit = {
+				is_core = HUN
+				OR = {
+					province_id = 624
+					province_id = 778
+				}
+			}
+			remove_core = HUN
+		}
 		any_pop = {
 			limit = {
 				is_primary_culture = no

HPM/events/Schleswig-Holstein.txt

@@ -9,7 +9,11 @@ country_event = {
 	trigger = {
 		OR = {
 			tag = DEN
-			tag = SCA
+			AND = {
+				tag = SCA
+				owns = 368
+				owns = 2557
+			}
 		}
 		OR = {
 			government = absolute_monarchy
@@ -36,6 +40,13 @@ country_event = {
 		set_country_flag = annex_schleswig_holstein
 		370 = { add_core = DEN }
 		371 = { add_core = DEN }
+		random_owned = {
+			limit = { owner = { tag = SCA } }
+			owner = {
+				370 = { add_core = SCA }
+				371 = { add_core = SCA }
+			}
+		}
 		SWH = { country_event = 90051 }
 		any_pop = {
 			limit = { has_pop_culture = danish }
@@ -103,7 +114,7 @@ country_event = {
 
 	option = {
 		name = "EVT90051OPTA"
-		DEN = {
+		FROM = {
 			release_vassal = SWH
 			country_event = 90054
 		}
@@ -134,8 +145,12 @@ country_event = {
 	trigger = {
 		OR = {
 			tag = DEN
-			tag = SCA
-		}		
+			AND = {
+				tag = SCA
+				owns = 368
+				owns = 2557
+			}
+		}
 		war = no
 		has_country_flag = annex_schleswig_holstein
 		owns = 369
@@ -247,7 +262,14 @@ country_event = {
 	picture = "danishgovernment"
 
 	trigger = {
-		tag = DEN
+		OR = {
+			tag = DEN
+			AND = {
+				tag = SCA
+				owns = 368
+				owns = 2557
+			}
+		}
 		OR = {
 			government = prussian_constitutionalism
 			government = hms_government
@@ -259,7 +281,7 @@ country_event = {
 		SWH = {
 			owns = 370
 			owns = 371
-			vassal_of = DEN
+			vassal_of = THIS
 		}
 	}
 
@@ -412,14 +434,14 @@ country_event = {
 			SWH = {
 				owns = 370
 				owns = 371
-				NOT = { vassal_of = DEN }
+				is_vassal = no
 				in_sphere = THIS
 				war = no
 			}
 			HOL = {
 				owns = 370
 				owns = 371
-				NOT = { vassal_of = DEN }
+				is_vassal = no
 				in_sphere = THIS
 				war = no
 			}
@@ -437,6 +459,11 @@ country_event = {
 		name = "EVT90055OPTA"
 		370 = { remove_core = DEN }
 		371 = { remove_core = DEN }
+		random_country = {
+			limit = { tag = SCA exists = yes }
+			370 = { remove_core = SCA }
+			371 = { remove_core = SCA }
+		}
 		prestige = 10
 		badboy = -5
 		any_country = {
@@ -630,6 +657,7 @@ country_event = {
 
 	trigger = {
 		tag = SWE
+		exists = yes
 		DEN = {
 			war_with = SWH
 			war_countries = {

HPM/localisation/00_HPM_decisions.csv

@@ -1276,7 +1276,7 @@ treaty_of_paris_1898_victory_desc;We have been victorious in our war against Spa
 moret_law_title;The Moret Law;;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,
 moret_law_desc;The Moret Law granted freedom to slaves in Puerto Rico born after 1868, slaves who served in the Spanish Army, slaves over 60 years old, and slaves who were owned by the Spanish government. It was the first in a series of reforms that saw slavery ended in Puerto Rico, well before it was ended in other Spanish colonies.;;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,
 claim_schleswig_title;Claim Schleswig;;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,
-claim_schleswig_desc;The duchies of Schleswig and Holstein have long been united and considered indivisible under the Danish crown, but a question of royal claim to the duchies combined with the Holsteinian desire to join in the larger German Confederation to the south has led to considerable difficulty for King Frederick VII. The treatment of Danish people in Schleswig living under Holsteinian domination has led to a call for the duchy to be incorporated into Denmark proper. This is unlikely to be looked on favourably by the conservative German aristocracy in Holstein.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,
+claim_schleswig_desc;The duchies of Schleswig and Holstein have long been united and considered indivisible under the $COUNTRY_ADJ$ crown, but a question of royal claim to the duchies combined with the Holsteinian desire to join in the larger German Confederation to the south has led to considerable difficulty for the $COUNTRY_ADJ$ monarch. The treatment of $COUNTRY_ADJ$ people in Schleswig living under Holsteinian domination has led to a call for the duchy to be incorporated into $COUNTRY$ proper. This is unlikely to be looked on favourably by the conservative German aristocracy in Holstein.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,
 reclaim_the_UK_title;Reclaim the British Isles;;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,
 reclaim_the_UK_desc;We must rise up and reclaim all of the British Isles -- the old Empire will exist once again!;;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,
 reform_the_UK_title;Reform the United Kingdom;;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,

HPM/localisation/00_HPM_events.csv

@@ -3692,7 +3692,7 @@ EVTNAME1010033;Kitty O'Shea;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,
 EVTDESC1010033;The revelation that Charles Stewart Parnell has been involved with a married woman, one Catherine O'Shea, and indeed is responsible for her subsequent divorce, was the scandal that ended his political career and prevented him from pushing the Home Rule agenda. Without him, it appears unlikely that the Irish Republican movement will gain the political clout it requires to attempt another passing of the Home Rule Bill.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,
 EVT1010033OPTA;Unfortunate. For the Irish, I mean.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,
 EVTNAME90050;The Annexation of Schleswig;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,,
-EVTDESC90050;The duchies of Schleswig and Holstein have long been united and considered indivisible under the Danish crown, but a question of royal claim to the duchies combined with the Holsteinian desire to join in the larger German Confederation to the south has led to considerable difficulty for King Frederick VII. The treatment of Danish people in Schleswig living under Holsteinian domination has led to a call for the duchy to be incorporated into $COUNTRY$ proper. This is unlikely to be looked on favorably by the conservative German aristocracy in Holstein.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,
+EVTDESC90050;The duchies of Schleswig and Holstein have long been united and considered indivisible under the $COUNTRY_ADJ$ crown, but a question of royal claim to the duchies combined with the Holsteinian desire to join in the larger German Confederation to the south has led to considerable difficulty for the $COUNTRY_ADJ$ monarch. The treatment of $COUNTRY_ADJ$ people in Schleswig living under Holsteinian domination has led to a call for the duchy to be incorporated into $COUNTRY$ proper. This is unlikely to be looked on favourably by the conservative German aristocracy in Holstein.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,
 EVT90050OPTA;Schleswig is a part of $COUNTRY$.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,
 EVTNAME900500;The Schleswig-Holstein War;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,
 EVTDESC900500;Our war against Schleswig-Holstein has brought us into conflict with our German allies.;;;;;;;;;;;;x,,,,,,,,,,,,,,,,,,,,,

HPM/poptypes/aristocrats.txt

@@ -50,7 +50,7 @@ luxury_needs = {
 	canned_food = 1.5
 	fruit = 5
 	wool = 10
-	#opium = 30
+	opium = 30
 	telephones = 10
 	automobiles = 10
 	aeroplanes = 5

HPM/poptypes/artisans.txt

@@ -38,7 +38,7 @@ luxury_needs = {
 	canned_food = 0.75
 	fruit = 1
 	wool = 3
-	#opium = 1
+	opium = 1
 	luxury_clothes = 1
 	luxury_furniture = 1
 	telephones = 1.25

HPM/poptypes/bureaucrats.txt

@@ -65,7 +65,7 @@ luxury_needs = {
 	canned_food = 0.75
 	fruit = 1
 	wool = 3
-	#opium = 1
+	opium = 1
 	luxury_clothes = 1
 	luxury_furniture = 1.5
 	telephones = 1.25

HPM/poptypes/capitalists.txt

@@ -47,6 +47,7 @@ everyday_needs = {
 luxury_needs = {
 	#luxury_clothes = 0.5
 	#luxury_furniture = 0.5
+	opium = 20
 	steel = 0.5
 	cement = 0.5
 	lumber = 1

HPM/poptypes/clergymen.txt

@@ -64,7 +64,7 @@ luxury_needs = {
 	canned_food = 0.75
 	fruit = 1
 	wool = 3
-	#opium = 1
+	opium = 1
 	luxury_clothes = 1
 	luxury_furniture = 1
 	telephones = 1.25

HPM/poptypes/clerks.txt

@@ -42,7 +42,7 @@ luxury_needs = {
 	canned_food = 0.75
 	fruit = 1
 	wool = 3
-	#opium = 1
+	opium = 1
 	luxury_clothes = 1
 	luxury_furniture = 1
 	telephones = 1.25

HPM/poptypes/officers.txt

@@ -71,7 +71,7 @@ luxury_needs = {
 	canned_food = 0.75
 	fruit = 1
 	wool = 3
-	#opium = 1
+	opium = 1
 	luxury_clothes = 1
 	luxury_furniture = 1
 	telephones = 1.25

HPM/poptypes/serfs.txt

@@ -30,7 +30,7 @@ everyday_needs = {
 	liquor = 2
 	regular_clothes = 1.2
 	furniture = 1.1
-	#opium = 10
+	opium = 10
 	fertilizer = 0.5 #0
 	explosives = 0.25
 }
@@ -48,7 +48,7 @@ luxury_needs = {
 	automobiles = 0.5
 	radio = 1.0
 	fuel = 0.1
-	#opium = 2
+	opium = 2
 }
 
 

HPM/poptypes/slaves.txt

@@ -22,7 +22,7 @@ everyday_needs = {
 }
 
 luxury_needs = {
-	#opium = 1
+	opium = 1
 }
 
 ideologies = {