Merge branch 'dev' into bug-fixes

.github/workflows/create_release.yml

@@ -30,8 +30,8 @@ jobs:
       - name: Read patch notes
         id: patch-notes
         run: |
-          # Read the contents of patch_notes.txt
-          patch_notes=$(cat patch_notes.txt)
+          # Read the contents of patch_notes.txt and base64 encode it
+          patch_notes=$(cat patch_notes.txt | base64)
           echo "patch_notes=$patch_notes" >> $GITHUB_OUTPUT
 
       - name: Create Release
@@ -45,6 +45,6 @@ jobs:
           body: |
             Compatible HoI4 Version: v${{ steps.get-version.outputs.compatible_version }}
             
-            ${{ steps.patch-notes.outputs.patch_notes }}
+            $(echo '${{ steps.patch-notes.outputs.patch_notes }}' | base64 --decode)
           draft: false
           prerelease: false

common/national_focus/harad.txt

@@ -1281,15 +1281,15 @@ focus = {
 		id = thepellardurendeavour
 		icon = GFX_goal_unknown
 		ai_will_do = { factor = 25 }
-		available = { has_civil_war = no country_exists = KND NOT = { has_war_with = KND } }
+		available = { has_civil_war = no country_exists = PEL NOT = { has_war_with = PEL } }
  x =7
  y =5
  mutually_exclusive = { }
  prerequisite = { focus = releasepellardur }
  cost = 10
   available_if_capitulated = yes
 	completion_reward = {
-		KND = {
+		PEL = {
 			add_ideas = HAR_endeavour
 			112 = { add_extra_state_shared_building_slots = 3 add_building_construction = { type = arms_factory level = 3 instant_build = yes } }
 			112 = { add_extra_state_shared_building_slots = 3 add_building_construction = { type = industrial_complex level = 3 instant_build = yes } }
@@ -1355,7 +1355,7 @@ focus = {
 		id = manufacturingefforts
 		icon = GFX_goal_generic_production2
 		ai_will_do = { factor = 5 }
-		available = { has_civil_war = no country_exists = KND country_exists = KND NOT = { has_war_with = KND } NOT = { has_war_with = KND } }
+		available = { has_civil_war = no country_exists = PEL country_exists = KND NOT = { has_war_with = KND } NOT = { has_war_with = PEL } }
  x =6
  y =6
  mutually_exclusive = { }
@@ -1366,7 +1366,7 @@ focus = {
 	completion_reward = {
 			add_tech_bonus = { name = manufacturing_effort bonus = 0.5 uses = 1 category = industry }
 			KND = { add_tech_bonus = { name = manufacturing_effort bonus = 0.5 uses = 1 category = industry } }
-			KND = { add_tech_bonus = { name = manufacturing_effort bonus = 0.5 uses = 1 category = industry } }
+			PEL = { add_tech_bonus = { name = manufacturing_effort bonus = 0.5 uses = 1 category = industry } }
 	}
  }
 
@@ -1375,7 +1375,7 @@ focus = {
 		id = thecoastalhighwayproject
 		icon = GFX_goal_generic_navy_cruiser
 		ai_will_do = { factor = 10 }
-		available = { has_civil_war = no country_exists = UMB country_exists = KND NOT = { has_war_with = UMB } NOT = { has_war_with = KND } }
+		available = { has_civil_war = no country_exists = UMB country_exists = PEL NOT = { has_war_with = UMB } NOT = { has_war_with = PEL } }
  x =8
  y =6
  mutually_exclusive = { }
@@ -1461,7 +1461,7 @@ focus = {
 		id = thepellardurarmada
 		icon = GFX_goal_generic_construct_naval_dockyard
 		ai_will_do = { factor = 15 }
-		available = { has_civil_war = no country_exists = KND NOT = { has_war_with = KND } }
+		available = { has_civil_war = no country_exists = PEL NOT = { has_war_with = PEL } }
  x =7
  y =7
  mutually_exclusive = { }
@@ -1471,7 +1471,7 @@ focus = {
 	completion_reward = {
 			112 = { add_extra_state_shared_building_slots = 5 add_building_construction = { type = dockyard level = 5 instant_build = yes } }
 			custom_effect_tooltip = HAR_pellardur_armada_tt
-			hidden_effect = { load_oob = "KND_Armada" }
+			hidden_effect = { load_oob = "PEL_Armada" }
 	}
  }
 
@@ -1536,7 +1536,7 @@ focus = {
 		id = afleettofear
 		icon = GFX_goal_generic_navy_doctrines_tactics
 		ai_will_do = { factor = 20 }
-		available = { has_civil_war = no country_exists = KND country_exists = UMB NOT = { has_war_with = KND } NOT = { has_war_with = UMB } }
+		available = { has_civil_war = no country_exists = PEL country_exists = UMB NOT = { has_war_with = PEL } NOT = { has_war_with = UMB } }
  x =8
  y =8
  mutually_exclusive = { }
@@ -1554,7 +1554,7 @@ focus = {
 		id = battleshipimprovement
 		icon = GFX_goal_generic_navy_battleship
 		ai_will_do = { factor = 10 }
-		available = { has_civil_war = no country_exists = KND country_exists = UMB NOT = { has_war_with = KND } NOT = { has_war_with = UMB } }
+		available = { has_civil_war = no country_exists = PEL country_exists = UMB NOT = { has_war_with = PEL } NOT = { has_war_with = UMB } }
  x =8
  y =9
  mutually_exclusive = { }

common/national_focus/lothlorien.txt

@@ -4513,7 +4513,6 @@ focus_tree = {
 				ruling_party = revolutionary
 				elections_allowed = no
 			}
-
 			hidden_effect = { news_event = { hours = 24 id = news.362 } }
 		}
 	}
@@ -4638,6 +4637,9 @@ focus_tree = {
 		completion_reward = {
 			# Add MP based on other commie countries and their commie suppoort
 			lth_add_sharedcause_mp = yes
+			set_rule = {
+				can_create_factions = yes
+			}
 		}
 	}
 

common/national_focus/rivendell.txt

@@ -990,6 +990,24 @@ focus_tree = {
 		completion_reward = { add_ideas = RIV_revisionist_regime }
 	}
 
+	#Focus for Global Revolution
+	focus = {
+		id = globalrevolution
+		icon = GFX_goal_generic_workers_and_farmers_rise_peasantry
+		ai_will_do = { factor = 25 }
+		available = { has_government = revolutionary }
+		relative_position_id = eraseelventraditions
+		x =0
+		y =1
+		mutually_exclusive = { }
+		prerequisite = { focus = eraseelventraditions}
+		cost = 10
+		available_if_capitulated = yes
+		completion_reward = {
+			create_faction = "global_collective"
+		}
+	}
+
 	#Focus for Keep the Skies Clear
 	focus = {
 		id = keeptheskiesclear

common/national_focus/shire.txt

@@ -635,6 +635,9 @@ focus = {
 	available_if_capitulated = yes
 	completion_reward = {
 		add_ideas = SHI_spread_the_message
+		set_rule = {
+			can_create_factions = yes
+		}
 	}
 }
 

common/on_actions/00_on_actions.txt

@@ -223,7 +223,6 @@ on_actions = {
 			if = {
 				limit = {
 					tag = GON
-					has_government = cooperative
 					FROM = {
 						original_tag = MOR
 					}

history/countries/HAR - Harad.txt

@@ -30,15 +30,12 @@ set_technology = {
 	gw_artillery = 1
 	basic_cav = 1
 	light_cav2 = 1
-	early_submarine = 1
-	basic_submarine = 1
 	longship_0 = 1
+	longship_1 = 1
 	war_galley_0 = 1
 	war_galley_0_bonus = 1
 	war_galley_1 = 1
-	early_battleship = 1
-	early_battlecruiser = 1
-	early_carrier = 1
+	caravel_0 = 1
 	transport = 1
 	merchant_ship = 1
 	trench_warfare = 1

history/units/PEL_Armada.txt

@@ -0,0 +1,17 @@
+### IJN ###
+units = {
+	fleet = {
+		name = "Pellardur Armada"
+		naval_base =7678
+		task_force = {
+			name = "Pellardur Armada"
+			location = 7678
+			ship = { definition = caravel equipment = { caravel_hull_0 = {amount = 1 owner = PEL} } }
+			ship = { definition = caravel equipment = { caravel_hull_0 = {amount = 1 owner = PEL} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = PEL} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = PEL} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = PEL} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = PEL} } }
+		}
+	}
+}

history/units/UMB_Armada.txt

@@ -1,13 +1,17 @@
 ### IJN ###
 units = {
-	navy = {
+	fleet = {
 		name = "Umbar Armada"
-		base =1248
-		location = 1248
-		ship = { definition = caravel equipment = { caravel_hull_0 = {amount = 2 owner = UMB} } }
-		ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
-		ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
-		ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
-		ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
+		naval_base =1248
+		task_force = {
+			name = "Umbar Armada"
+			location = 1248
+			ship = { definition = caravel equipment = { caravel_hull_0 = {amount = 1 owner = UMB} } }
+			ship = { definition = caravel equipment = { caravel_hull_0 = {amount = 1 owner = UMB} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
+			ship = { definition = longship equipment = { longship_hull_0 = {amount = 1 owner = UMB} } }
+		}
 	}
 }

localisation/english/achievements_l_english.yml

@@ -14,7 +14,7 @@ ANG_the_necromancer_NAME:0 "Somehow He Has Returned"
 ANG_the_necromancer_DESC:0 "As Angmar, bring an exiled Sauron back into power"
 one_ring_to_rule_them_all_NAME:0 "One Ring to Rule Them All"
 one_ring_to_rule_them_all_DESC:0 "As any country, seize the Ring for yourself"
-revenge_for_the_battle_of_the_five_armies_NAME:0 "Avenge the Battle of the give armies"
+revenge_for_the_battle_of_the_five_armies_NAME:0 "Avenge the Battle of the Five Armies"
 revenge_for_the_battle_of_the_five_armies_DESC:0 "As Gundabad, control all core states of Erebor, Mirkwood and Dale"
 SHI_taking_the_hobbits_to_isengard_NAME:0 "Taking the Hobbits to Isengard"
 SHI_taking_the_hobbits_to_isengard_DESC:0 "As the Shire, control all of Isengard's core states"

localisation/english/factions_l_english.yml

@@ -25,6 +25,7 @@
  eastlands_alliance:0 "The easterlings"
  RHU_the_easter_defense_pact:0 "The easter defense pact"
  ANG_faction_northern_alliance:0 "The Northern Alliance"
+ global_collective:0 "Global Collective"
 
  # Generic factions
  FACTION_NAME_COOPERATIVE_1:0 "$LEADER_COUNTRY_ADJ$ Alliance"

localisation/english/harad/harad_l_english.yml

@@ -1,8 +1,8 @@
 l_english:
 HAR_liberal_union_tt:0 "Umbar, Khand and Pellardur will be released as faction members."
 HAR_authoritarian_federation_tt:0 "Umbar, Khand and Pellardur will be released as puppets."
-HAR_pellardur_armada_tt:0 "Will raise 2 Heavy Cruisers and 4 Destroyes into Pellardur's navy."
-HAR_umbar_armada_tt:0 "Will raise 2 Heavy Cruisers and 4 Destroyes into Umbar's navy."
+HAR_pellardur_armada_tt:0 "Will raise 2 caravels and 4 longships into Pellardur's navy."
+HAR_umbar_armada_tt:0 "Will raise 2 caravels and 4 longships into Umbar's navy."
 politicalamelioration:0 "Political Amelioration"
 constructionpursuits:0 "Construction Pursuits"
 constructionpursuits_desc:0 ""

localisation/english/rivendell/rivendell_focus_l_english.yml

@@ -63,6 +63,8 @@ takehisring:0 "Take his Ring!"
 takehisring_desc:0 ""
 eraseelventraditions:0 "Erase Elven Traditions"
 eraseelventraditions_desc:0 ""
+globalrevolution:0 "Global Revolution"
+globalrevolution_desc:0 ""
 encourageareunificationofarnor:0 "Encourage a Reunification of Arnor"
 encourageareunificationofarnor_desc:0 ""
 keeptheskiesclear:0 "Keep the Skies Clear"

patch_notes.txt

@@ -4,7 +4,7 @@ General:
 - Updates some old event localization from Fascisme to Belligerent
 
 Dorwinion:
-- Added new custom icon for the Wine National Spirit (Designed by yeoudal)
+- Added new custom icon for the Wine National Spirit (Contribution by yeoudal)
 
 Dol Amroth:
 - Fixed missing localization for events
@@ -25,4 +25,6 @@ Angmar:
 General:
 - Fixed localization and image of referendum event
 - Added local supply to several states
-- Significantly increasedd the bonus range you get from setting supply hubs to 'motorized'
+- Significantly increasedd the bonus range you get from setting supply hubs to 'motorized'
+- Allowed several revolutionary countries to create their own factions (Contribution by sealord72)
+