Merge branch 'dev' into velius-uldum-flavor

Warcraft-GoA-Development-Team · Sep 26, 2024 · d49ad3e · d49ad3e
2 parents 61142bf + 0b2aa04
commit d49ad3e
Show file tree

Hide file tree

Showing 112 changed files with 7,865 additions and 488 deletions.
diff --git a/.github/workflows/branch-naming-scheme.yml b/.github/workflows/branch-naming-scheme.yml
@@ -0,0 +1,26 @@
+name: Branch Naming Policy Action
+
+on:
+  create:
+  delete:
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  branch-naming-policy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run Branch Naming Policy Action
+        uses: nicklegan/[email protected]
+        if: github.ref_type == 'branch' || github.ref_type == 'pull_request'
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          regex: '^(feat|fix)\/(mixed|code|2D|3D|map|char|l10n|magic)\/([a-z0-9]+)'
+          flags: i
+          # token: ${{ secrets.REPO_TOKEN }}
+          # delete: true
diff --git a/common/buildings/wc_special_buildings.txt b/common/buildings/wc_special_buildings.txt
@@ -64,6 +64,10 @@ corpse_of_agamaggan_01 = {
 
 dark_portal_01 = {
 	type_icon = "icon_structure_dark_portal.dds"
+	asset = {
+		type = pdxmesh
+		name = "building_special_dark_portal2_mesh"
+	}
 
 	is_enabled = {
 		dark_portal_building_enabled_trigger = yes
@@ -85,6 +89,10 @@ dark_portal_01 = {
 
 dark_portal_02 = {
 	type_icon = "icon_structure_dark_portal.dds"
+	asset = {
+		type = pdxmesh
+		name = "building_special_dark_portal_mesh"
+	}
 
 	is_enabled = {
 		dark_portal_building_enabled_trigger = yes

diff --git a/common/casus_belli_types/00_civil_war.txt b/common/casus_belli_types/00_civil_war.txt
@@ -241,7 +241,7 @@ independence_faction_war = {
 				value = medium_prestige_value
 				multiply = -1
 			}
-			
+
 			# Warcraft
 			decrease_any_authority_effect = yes
 		}
@@ -286,9 +286,9 @@ independence_faction_war = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		hidden_effect = {
 			scope:attacker = {
@@ -303,8 +303,8 @@ independence_faction_war = {
 
 		scope:defender = {
 			stress_impact = {
- 				arrogant = medium_stress_impact_gain
- 			}
+				arrogant = medium_stress_impact_gain
+			}
 
 			add_character_flag = {
 				flag = recent_independence_faction_war
@@ -391,7 +391,7 @@ independence_faction_war = {
 
 	max_attacker_score_from_battles = 100
 	max_defender_score_from_battles = 50
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150
 
@@ -441,15 +441,15 @@ liberty_faction_war = {
 
 		#EP2 Accolade glory gain from winning against higher ranked enemy
 		scope:attacker = { accolade_attacker_war_end_glory_gain_med_effect = yes }
-		
+
 		# LEGITIMACY FROM LOSING FACTION WAR
 		faction_war_end_defeat_legitimacy_effect = yes
-	
+
 		scope:defender = {
 
 			# Warcraft
 			decrease_any_authority_effect = yes
-			
+
 			add_prestige = -500
 
 			every_character_war = {
@@ -540,9 +540,9 @@ liberty_faction_war = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		hidden_effect = {
 			scope:attacker = {
@@ -556,8 +556,8 @@ liberty_faction_war = {
 		}
 		scope:defender = {
 			stress_impact = {
- 				arrogant = medium_stress_impact_gain
- 			}
+				arrogant = medium_stress_impact_gain
+			}
 			add_character_flag = {
 				flag = recent_liberty_faction_war
 				years = faction_war_white_peace_cooldown
@@ -624,7 +624,7 @@ liberty_faction_war = {
 
 	max_attacker_score_from_battles = 100
 	max_defender_score_from_battles = 50
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150
 
@@ -682,7 +682,7 @@ populist_war = {
 
 	on_victory_desc = {
 		desc = populist_war_victory_desc
-		
+
 	}
 
 	on_victory = {
@@ -753,16 +753,16 @@ populist_war = {
 
 	on_white_peace_desc = {
 		desc = populist_war_white_peace_desc
-		
+
 	}
 
 	on_white_peace = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		on_white_peace_faction_revolt_war = yes
 		hidden_effect = {
@@ -802,7 +802,7 @@ populist_war = {
 
 	on_defeat_desc = {
 		desc = populist_war_defeat_desc
-		
+
 	}
 
 	on_defeat = {
@@ -878,7 +878,7 @@ populist_war = {
 
 	max_attacker_score_from_battles = 100
 	max_defender_score_from_battles = 50
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150
 
@@ -974,15 +974,15 @@ claimant_faction_war = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 
 		scope:defender = {
 			stress_impact = {
- 				arrogant = medium_stress_impact_gain
- 			}
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		on_white_peace_faction_revolt_war = yes
 
@@ -1042,7 +1042,7 @@ claimant_faction_war = {
 
 	max_attacker_score_from_battles = 50
 	max_defender_score_from_battles = 100
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150
 
@@ -1178,14 +1178,14 @@ depose_war = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		scope:defender = {
 			stress_impact = {
- 				arrogant = medium_stress_impact_gain
- 			}
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		on_white_peace_faction_revolt_war = yes
 	}
@@ -1236,7 +1236,7 @@ depose_war = {
 	defender_score_from_occupation_scale = 50
 	max_attacker_score_from_battles = 100
 	max_defender_score_from_battles = 100
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150
 
@@ -1395,15 +1395,15 @@ refused_liege_demand_war = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 
 		scope:defender = {
 			stress_impact = {
- 				arrogant = medium_stress_impact_gain
- 			}
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		hidden_effect = {
 			scope:attacker = {
@@ -1459,7 +1459,7 @@ refused_liege_demand_war = {
 				}
 			}
 		}
-		
+
 		on_lost_request_revolt_war = yes
 	}
 
@@ -1485,7 +1485,7 @@ refused_liege_demand_war = {
 
 	max_attacker_score_from_battles = 100
 	max_defender_score_from_battles = 50
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150
 
@@ -1644,9 +1644,9 @@ independence_war = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		hidden_effect = {
 			scope:attacker = {
@@ -1662,8 +1662,8 @@ independence_war = {
 		scope:defender = {
 			add_prestige = minor_prestige_value
 			stress_impact = {
- 				arrogant = medium_stress_impact_gain
- 			}
+				arrogant = medium_stress_impact_gain
+			}
 		}
 	}
 
@@ -1733,7 +1733,7 @@ independence_war = {
 
 	max_attacker_score_from_battles = 100
 	max_defender_score_from_battles = 50
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150
 
@@ -1794,7 +1794,7 @@ nation_fracturing_faction_war = {
 
 		#EP2 Accolade glory gain from winning against higher ranked enemy
 		scope:attacker = { accolade_attacker_war_end_glory_gain_med_effect = yes }
-		
+
 		create_title_and_vassal_change = {
 			type = independency
 			save_scope_as = change
@@ -1863,9 +1863,9 @@ nation_fracturing_faction_war = {
 				limit = { is_ai = no }
 				send_interface_toast = {
 					type = event_generic_neutral
-   					title = liege_primary_title_dissolution
-   					desc = liege_primary_title_dissolution_desc
-   					left_icon = scope:defender
+					title = liege_primary_title_dissolution
+					desc = liege_primary_title_dissolution_desc
+					left_icon = scope:defender
 				}
 			}
 		}
@@ -1914,9 +1914,9 @@ nation_fracturing_faction_war = {
 		scope:attacker = {
 			show_pow_release_message_effect = yes
 			stress_impact = {
- 				ambitious = medium_stress_impact_gain
- 				arrogant = medium_stress_impact_gain
- 			}
+				ambitious = medium_stress_impact_gain
+				arrogant = medium_stress_impact_gain
+			}
 		}
 		hidden_effect = {
 			scope:attacker = {
@@ -1931,8 +1931,8 @@ nation_fracturing_faction_war = {
 
 		scope:defender = {
 			stress_impact = {
- 				arrogant = medium_stress_impact_gain
- 			}
+				arrogant = medium_stress_impact_gain
+			}
 
 			add_character_flag = {
 				flag = recent_nation_fracturing_faction_war
@@ -2004,7 +2004,7 @@ nation_fracturing_faction_war = {
 
 	max_attacker_score_from_battles = 100
 	max_defender_score_from_battles = 50
-	
+
 	max_defender_score_from_occupation = 150
 	max_attacker_score_from_occupation = 150