Merge pull request #108 from HoI4-LOTRMod-Team/dev

Dev

.github/workflows/create_release.yml

@@ -9,9 +9,11 @@ jobs:
   build:
     name: Create Release
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Get current date and time in CEST, and compatible version from descriptor.mod
         id: get-version
@@ -22,17 +24,17 @@ jobs:
           # Get current date and time in CEST
           date_time=$(TZ="Europe/Paris" date +'%d-%m-%Y_%H-%M')
 
-          echo "::set-output name=compatible_version::$compatible_version"
-          echo "::set-output name=date_time::$date_time"
+          echo "compatible_version=$compatible_version" >> $GITHUB_OUTPUT
+          echo "date_time=$date_time" >> $GITHUB_OUTPUT
 
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
+        uses: ncipollo/release-action@v1.13.0
         env:
           GITHUB_TOKEN: ${{ secrets.LOTR_MOD_RELEASE_TOKEN }}
         with:
-          tag_name: ${{ steps.get-version.outputs.date_time }}
-          release_name: ${{ steps.get-version.outputs.date_time }}
+          tag: ${{ steps.get-version.outputs.date_time }}
+          name: ${{ steps.get-version.outputs.date_time }}
           body: |
             Compatible HoI4 Version: v${{ steps.get-version.outputs.compatible_version }}
           draft: false

common/ai_strategy_plans/ANG_strategy_plans.txt

@@ -8,7 +8,7 @@ ANG_historical_plan = {
 
     enable = {
         OR = {
-			AND = {
+			ANG = {
 				is_historical_focus_on = yes
 				OR = {
 					has_game_rule = {
@@ -19,7 +19,7 @@ ANG_historical_plan = {
 			}
 			has_game_rule = {
 				rule = ANG_AI_BEHAVIOR 
-				option = BELLIGERENT_HISTORICAL
+				option = UNALIGNED_HISTORICAL
 			}
 		}
     }
@@ -46,4 +46,75 @@ ANG_historical_plan = {
         construction_effort_2
         ANG_request_investment_neighbours
     }
+}
+
+ANG_belligerent_plan = {
+    name = "Angmar Belligerent plan"
+    desc = "Belligerent behavior for Angmar"
+
+    allowed = {
+        original_tag = ANG
+    }
+
+    enable = {
+        OR = {
+			ANG = {
+                is_historical_focus_on = no
+                has_country_flag = gameplan_going_belligerent
+			}
+		}
+    }
+    abort = {
+        always = no
+    }
+
+    ai_national_focuses = {
+        thefateofangmar
+        industrial_effort
+        ANG_seek_former_glory
+        ANG_boost_the_industry
+        ANG_civil_unrest
+        ANG_boost_the_industry_civilian
+        ANG_back_to_the_old_ways
+        ANG_seek_help_from_mordor
+        construction_effort_2
+        ANG_join_forces_with_orcs
+        ANG_strengthen_the_new_goverment
+    }
+}
+
+ANG_cooperative_plan = {
+    name = "Angmar Cooperative plan"
+    desc = "Cooperative behavior for Angmar"
+
+    allowed = {
+        original_tag = ANG
+    }
+
+    enable = {
+        OR = {
+			ANG = {
+                is_historical_focus_on = no
+                has_country_flag = gameplan_going_cooperative
+			}
+		}
+    }
+    abort = {
+        always = no
+    }
+
+    ai_national_focuses = {
+        thefateofangmar
+        industrial_effort
+        ANG_stay_true_to_the_people
+        ANG_boost_the_industry
+        ANG_grow_a_forest
+        ANG_boost_the_industry_civilian
+        ANG_invest_in_the_people
+        ANG_establish_democratic_goverment
+        construction_effort
+        ANG_denounce_the_witch_king
+        ANG_reconcile_with_arnor
+        ANG_boost_the_industry_civilian_2
+    }
 }

common/ai_strategy_plans/GON_strategy_plans.txt

@@ -7,7 +7,13 @@ GON_historical_plan = {
     }
 
     enable = {
-        is_historical_focus_on = yes
+        OR = {
+            is_historical_focus_on = yes
+            has_game_rule = {
+				rule = GON_AI_BEHAVIOR 
+				option = COOPERATIVE_PLAN
+			}
+        }
     }
     abort = {
         always = no
@@ -27,6 +33,9 @@ GON_historical_plan = {
         GON_prepare_for_the_growing_theat_north
         GON_improve_infrastructure_west
 
+        GON_develop_the_south
+        GON_develop_the_west
+
 		GON_limit_denethor_political_power
 		GON_declare_aragorn_the_rightful_heir
 
@@ -40,6 +49,7 @@ GON_historical_plan = {
 		GON_send_faramir_with_the_fellowship = 0
 		GON_delegitimize_aragorns_claim = 0
 		GON_persuade_aragorn_to_come_to_Gondor = 0
+        GON_send_help_towards_aragorn = 0
 	}
 }
 
@@ -59,8 +69,30 @@ GON_cooperative_unhistorical = {
         always = no
     }
 
-	focus_factors = {
-		GON_delegitimize_aragorns_claim = 0
+	ai_national_focuses = {
+        GON_internal_policy_department
+		GON_reinforce_osgilliath
+        GON_expand_the_military_production
+		GON_where_is_the_string
+		GON_university_of_minas_tirith
+
+		GON_honor_isildurs_legacy
+		GON_prepare_for_the_king_return
+		GON_rally_support_from_the_people
+		GON_limit_denethor_militair_power
+
+        GON_prepare_for_the_growing_theat_north
+        GON_improve_infrastructure_west
+
+        GON_develop_the_south
+        GON_develop_the_west
+
+		GON_limit_denethor_political_power
+		GON_declare_aragorn_the_rightful_heir
+
+		GON_invite_aragorn_to_minas_tirith
+		GON_crown_aragorn_king
+		GON_restore_the_kingdom_of_gondor
 	}
 }
 
@@ -115,6 +147,32 @@ GON_unaligned_unhistorical = {
         always = no
     }
 
+    ai_national_focuses = {
+        GON_delegitimize_aragorns_claim
+        GON_change_the_law
+
+        GON_internal_policy_department
+		GON_reinforce_osgilliath
+        GON_expand_the_military_production
+		GON_where_is_the_string
+		GON_university_of_minas_tirith
+
+        GON_purge_the_crown_loyalists
+        GON_enforce_militair_loyalty
+        GON_gondor_propaganda
+        GON_publish_statement
+
+        GON_prepare_for_the_growing_theat_north
+        GON_improve_infrastructure_west
+
+        GON_develop_the_south
+        GON_develop_the_west
+
+        GON_steward_of_the_people
+        GON_rally_the_nation
+
+    }
+
 	focus_factors = {
 		GON_honor_isildurs_legacy = 0
         GON_gondor_needs_no_king = 0

common/ai_strategy_plans/HAR_strategy_plans.txt

@@ -7,21 +7,7 @@ HAR_historical_plan = {
     }
 
     enable = {
-        OR = {
-			AND = {
-				is_historical_focus_on = yes
-				OR = {
-					has_game_rule = {
-						rule = HAR_AI_BEHAVIOR 
-						option = DEFAULT
-					}
-				}
-			}
-			has_game_rule = {
-				rule = HAR_AI_BEHAVIOR 
-				option = BELLIGERENT_HISTORICAL
-			}
-		}
+        is_historical_focus_on = yes
     }
     abort = {
         always = no

common/ai_strategy_plans/LTH_strategy_plans.txt

@@ -358,7 +358,7 @@ LTH_gameplan_belligerent = {
     }
 
     enable = {
-		has_country_flag = gamplan_going_belligerent
+		has_country_flag = gameplan_going_belligerent
 		NOT = { has_country_flag = gameplan_bully_elves }
 		NOT = { has_country_flag = gameplan_bully_mortals }
 		NOT = { has_country_flag = gamplan_harmonic_ascendancy }
@@ -447,7 +447,7 @@ LTH_gameplan_belligerent_bully_elves = {
     }
 
     enable = {
-		has_country_flag = gamplan_going_belligerent
+		has_country_flag = gameplan_going_belligerent
 		has_country_flag = gameplan_bully_elves
 		NOT = { has_country_flag = gamplan_harmonic_ascendancy }
     }
@@ -543,7 +543,7 @@ LTH_gameplan_belligerent_bully_mortals = {
     }
 
     enable = {
-		has_country_flag = gamplan_going_belligerent
+		has_country_flag = gameplan_going_belligerent
 		has_country_flag = gameplan_bully_mortals
 		NOT = { has_country_flag = gamplan_harmonic_ascendancy }
     }

common/ai_strategy_plans/MOR_strategy_plans.txt

@@ -8,15 +8,7 @@ MOR_historical_plan = {
 
     enable = {
         OR = {
-			AND = {
-				is_historical_focus_on = yes
-				OR = {
-					has_game_rule = {
-						rule = MOR_AI_BEHAVIOR 
-						option = DEFAULT
-					}
-				}
-			}
+			is_historical_focus_on = yes
 			has_game_rule = {
 				rule = MOR_AI_BEHAVIOR 
 				option = BELLIGERENT_HISTORICAL
@@ -77,7 +69,7 @@ MOR_belligerent_unhistorical = {
     }
 
     enable = {
-        has_country_flag = gamplan_going_belligerent
+        has_country_flag = gameplan_going_belligerent
 		is_historical_focus_on = no
     }
     abort = {

common/ai_strategy_plans/RHU_strategy_plans.txt

@@ -1,4 +1,4 @@
-RHU_historical_plan = {
+RHU_belligerent_historical_plan = {
     name = "Rhun historical plan"
     desc = "Historical behavior for Rhun"
 
@@ -7,21 +7,15 @@ RHU_historical_plan = {
     }
 
     enable = {
+        has_country_flag = gameplan_going_belligerent
         OR = {
-			AND = {
-				is_historical_focus_on = yes
-				OR = {
-					has_game_rule = {
-						rule = RHU_AI_BEHAVIOR 
-						option = DEFAULT
-					}
-				}
-			}
-			has_game_rule = {
-				rule = RHU_AI_BEHAVIOR 
-				option = BELLIGERENT_HISTORICAL
-			}
-		}
+            is_historical_focus_on = yes
+            has_game_rule = {
+                rule = RHU_AI_BEHAVIOR 
+                option = BELLIGERENT_HISTORICAL
+            }
+        }
+
     }
     abort = {
         always = no
@@ -59,4 +53,39 @@ RHU_historical_plan = {
         RHU_look_to_our_neighbours
         RHU_lay_claim_on_the_iron
     }
+}
+
+RHU_belligerent_unhistorical_plan = {
+    name = "Rhun unhistorical plan"
+    desc = "Historical behavior for Rhun"
+
+    allowed = {
+        original_tag = RHU
+    }
+
+    enable = {
+        has_country_flag = gameplan_going_belligerent
+        is_historical_focus_on = no
+        has_game_rule = {
+            rule = RHU_AI_BEHAVIOR 
+            option = BELLIGERENT_UNHISTORICAL
+        }
+    }
+    abort = {
+        always = no
+    }
+
+    ai_national_focuses = {
+        RHU_follow_the_dark_lord
+        RHU_kill_the_blue_wizards
+        RHU_develop_the_industry
+        RHU_develop_the_south
+        RHU_army_focus
+        RHU_develop_the_north
+        power_to_khamul
+        RHU_develop_military_south
+        RHU_develop_the_east
+        RHU_create_faction
+        RHU_honor_morgoth
+    }
 }

common/country_leader/00_traits_advisors_lotr.txt

@@ -51,7 +51,7 @@ leader_traits = {
             }
             modifier = {
                 is_going_belligerent = yes
-                date > 3020.01.01
+                date > 3019.01.01
                 add = 10
             }
         }