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

Dev

.github/workflows/create_release.yml

@@ -32,11 +32,10 @@ jobs:
         run: |
           # Read the contents of patch_notes.txt
           patch_notes=$(cat patch_notes.txt)
-          # Escape newline characters to be compatible with GitHub Actions output
-          patch_notes="${patch_notes//'%'/'%25'}"
-          patch_notes="${patch_notes//$'\n'/'%0A'}"
-          patch_notes="${patch_notes//$'\r'/'%0D'}"
-          echo "patch_notes=$patch_notes" >> $GITHUB_OUTPUT
+          # Avoid escaping newlines
+          echo "patch_notes<<EOF" >> $GITHUB_OUTPUT
+          echo "$patch_notes" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Create Release
         id: create_release

.gitignore

@@ -1,3 +1,3 @@
 .vscode/*
- __pycache__/
- *.pyc
+__pycache__/*
+*.pyc

README.md

@@ -20,14 +20,16 @@ Note that downloading the mod from sources other than the Steam workwhop will re
 
 If you want to contribute to this project, feel free to get in touch through discord or open a pull request!
 
-Not that by opening a pull-request you grant us a perpetual permission to use the contents therein for this mod (unless explicitly agreed otherwise). Please stick with CC/public domain resources, give credit where necessary, or make sure you have an appropriate license for external assets.
+Note that by opening a pull-request you grant us a perpetual permission to use the contents therein for this mod (unless explicitly agreed otherwise). Please stick with CC/public domain resources, give credit where necessary, or make sure you have an appropriate license for external assets.
 
 Note: The `dev` branch and the derivatives thereof are our working branches. The `master` branch reflects what is live on the workshop and is only commited to when a new patch is released.
 
 We recommend looking through our [Wiki pages](https://github.com/HoI4-LOTRMod-Team/HoI4-LotrMod/wiki) for information on the codebase and familiatizing yourself with our custom GFX scripts.
 
 We also recommend using our custom [GFX Search Tool](https://hoi4-lotrmod-team.github.io/HoI4-LotrMod) to find appropriate images/icons for your focuses, events etc.
 
-### Disclaimer
+**NOTE:** Several parts of this mod are licensed *exclusively* to this project. Do not re-use or re-upload any assets from this repository in or to any other projects without express permission from the authors.
 
-Several parts of this mod are licensed *exclusively* to this project. Do not re-use or re-upload any assets from this repository in or to any other projects without express permission from the authors.
+## Disclaimer
+
+This mod utilizes characters and events from "The Lord of the Rings" (LOTR) books and movies. It is a non-commercial, volunteer-based project and does not accept any form of donations. This mods contents are heavily transformative, constitute a parody and do not negatively impact the potential market for the original works, nor can they serve as a substitute for them. Accordingly, any references made within this mod to the LOTR intellectual property are protected under the fair use doctrine (U.S. Code 17 107).

additional_credits.txt

@@ -25,4 +25,27 @@ Elven city artwork (loading screen) by Tummi (Vladimir Stana) (https://www.artst
 
 Anorion font by Pete Klassen (https://www.fontspace.com/aniron-font-f2247)
 Merienda font by Eduardo Tunni (http://www.tipo.net.ar)
-Neucha font by Jovanny Lemonad (http://www.jovanny.ru)
+Neucha font by Jovanny Lemonad (http://www.jovanny.ru)
+
+
+Main menu background music:
+ - "Lonely Mountain", by Rafael Krux (https://freepd.com/epic.php)
+
+
+Main menu background picture created with the following models:
+
+ - "Museums Old Book 1767" (https://skfb.ly/osqDw) by Idmenthal is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Book Open" (https://skfb.ly/6pMGN) by FlukierJupiter is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "One Ring" (https://skfb.ly/6nTBu) by JayDesigns3D is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Old / Ancient Scroll" (https://skfb.ly/6SMq7) by Kigha is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Ink Bottle with Quill" (https://skfb.ly/oFHzM) by Matthew Collings is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Old Book" (https://skfb.ly/6q9MP) by g.saintecatherine is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Dagger" (https://skfb.ly/oLNnw) by Michael Belo is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Old table with ornaments and scratches 4k" (https://skfb.ly/ovrrN) by alexi.smnd is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Salazar Slytherin locket" (https://skfb.ly/oBTXp) by Chao Kurosaki is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Morgul-blade" (https://skfb.ly/6T8WN) by Person.bird is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Candle Holder" (https://skfb.ly/onQoF) by John Machine is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Elven Leaf Brooch (LOTR)" (https://skfb.ly/6RWuT) by Hans-Joachim Brucherseifer is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - "Simple cloth on objects" (https://skfb.ly/orvID) by FordVFX is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+ - Inscriptions from: http://www.elvish.org/gwaith/movie_otherinscr.htm
+

common/abilities/generic_leader_abilities.txt

@@ -323,4 +323,53 @@ ability = {
 			}
 		}
 	}
+
+	valiant_charge = {
+		name = ABILITY_VALIANT_CHARGE
+		desc = ABILITY_VALIANT_CHARGE_DESC
+
+		sound_effect = command_power_ability_offensive
+
+		type = army_leader
+
+		allowed = {
+			has_ability = valiant_charge
+			is_border_war = no
+		}
+
+
+		ai_will_do = {
+			factor = -1
+			modifier = {
+				FROM = {
+					has_war_support > 0.1
+					command_power > 1.5
+				}
+				check_variable = { num_units_offensive_combats > 6 }
+
+				set_temp_variable = { temp = avg_offensive_combat_status }
+				check_variable = { temp > 0.45 }
+				check_variable = { ai_random > temp }
+
+				add = 2
+			}
+		}
+
+		cost = 0.35
+		duration = 168
+
+		one_time_effect = {
+			add_temporary_buff_to_units = {
+				combat_offense = 0.3
+				combat_breakthrough = 0.3
+				org_damage_multiplier = -1.0
+				str_damage_multiplier = 0.6
+				war_support_reduction_on_damage = 0.2
+				cannot_retreat_while_attacking = 1.0
+
+				days = 7
+				tooltip = ABILITY_FORCE_ATTACK_TOOLTIP
+			}
+		}
+	}
 }

common/achievements/achievements.txt

@@ -100,11 +100,10 @@ MOR_not_my_dark_lord = {
 	}
 
 	happened = {
-		has_country_flag = MOR_orcs_have_taken_over_mordor
+		has_completed_focus = arealmoforcs
 		ANG = {
 			has_country_flag = ANG_sauron_returned
 		}
-		has_global_flag = orcs_of_mordor_declared_war_on_ANG_achievement_flag
 		has_global_flag = orcs_of_mordor_won_war_against_ANG_achievement_flag
 	}
 }
@@ -227,7 +226,7 @@ ISE_a_wizard_is_never_late = {
 				is_puppet_of = RHU
 			}
 		}
-		has_country_flag = ISE_won_war_against_MOR_flag
+		has_global_flag = ISE_won_war_against_MOR_flag
 	}
 }
 
@@ -240,7 +239,7 @@ GON_one_does_simply_walk_into_mordor = {
 
 	happened = {
 		date < 3021.1.1
-		has_country_flag = GON_won_war_against_MOR_flag
+		has_global_flag = GON_won_war_against_MOR_flag
 	}
 }
 
@@ -251,7 +250,7 @@ GON_for_frodo = {
 	}
 
 	happened = {
-		has_country_flag = GON_taken_black_gate_from_MOR_achievement_flag
+		has_global_flag = GON_taken_black_gate_from_MOR_achievement_flag
 	}
 }
 
@@ -266,4 +265,174 @@ LTH_elven_boogaloo = {
 		has_global_flag = fs_ring_destroyed
 		has_global_flag = fs_elven_fellowship
 	}
+}
+
+the_elves_are_gone = {
+	possible = {
+		achievement_standard_possible_check = yes
+		hidden_trigger = {
+			is_elves_init = no # for Loth. Clutters the tooltip, so hidden
+		}
+		OR = {
+			is_orcs = yes
+			can_switch_to_orcs = yes
+		}
+	}
+
+	happened = {
+		is_orcs = yes
+		has_government = belligerent
+		custom_trigger_tooltip = {
+			tooltip = "No country: is Elves"
+			NOT = {
+				any_country = {
+					is_elves = yes
+					exists = yes
+				}
+			}
+		}
+	}
+}
+
+hobbit_slam_dunk = {
+	possible = {
+		achievement_standard_possible_check = yes
+		OR = {
+			tag = ERE
+			tag = MIR
+			tag = GON
+			tag = LTH
+		}
+	}
+
+	happened = {
+		has_war_with = MOR
+		ring_frodo_is_not_dead = yes
+		hidden_trigger = { NOT = { has_global_flag = fs_elven_fellowship } }
+		NOT = { has_global_flag = fs_ring_seized }
+		ring_has_been_destroyed = yes
+		ROOT = { NOT = { has_country_flag = fs_has_attacked_fellowship } }
+	}
+}
+
+LTH_aight_imma_head_out = {
+	possible = {
+		achievement_standard_possible_check = yes
+		tag = LTH
+	}
+
+	happened = {
+		has_global_flag = celeborn_and_galadriel_left_with_gondor_mordor_defeated_achievement_flag
+	}
+}
+
+no_meat_no_defeat = {
+	possible = {
+		achievement_standard_possible_check = yes
+		NOT = { tag = MOR }
+	}
+
+	happened = {
+		MOR = {
+			casualties_inflicted_by = {
+				opponent = ROOT
+				thousands > 1000
+			}
+		}
+		ROOT = {
+			casualties_inflicted_by = {
+				opponent = MOR
+				thousands < 10
+			}
+		}
+	}
+}
+
+#Rohan
+ROH_everyone_is_rohappy = {
+	possible = {
+		achievement_standard_possible_check = yes
+		tag = ROH
+	}
+
+	happened = {
+		rohan_lords_region_1_all_demands_met = yes
+		rohan_lords_region_2_all_demands_met = yes
+		rohan_lords_region_3_all_demands_met = yes
+		rohan_lords_region_4_all_demands_met = yes
+		rohan_lords_region_5_all_demands_met = yes
+	}
+}
+
+ROH_my_horse_is_amazing = {
+	possible = {
+		achievement_standard_possible_check = yes
+		tag = ROH
+	}
+
+	happened = {
+		ROH = {
+			has_government = cooperative
+			custom_trigger_tooltip = {
+				tooltip = ACHIEVEMENT_never_in_faction_tt
+				has_dynamic_modifier = {
+					modifier = ACHIEVEMENT_never_in_faction
+				}
+			}
+			custom_trigger_tooltip = {
+				tooltip = ACHIEVEMENT_my_horse_is_amazing_tt
+				has_dynamic_modifier = {
+					modifier = ACHIEVEMENT_my_horse_is_amazing
+				}
+			}
+		}
+		ISE = {
+			has_ever_capitulated = yes
+		}
+		MOR = {
+			has_ever_capitulated = yes
+		}
+	}
+}
+
+ROH_orthanc_you_very_much = {
+	possible = {
+		achievement_standard_possible_check = yes
+		tag = ROH
+	}
+
+	happened = {
+		controls_state = 31
+		date < "3022.1.1"
+	}
+}
+
+ELU_every_hole_is_home = {
+	possible = {
+		achievement_standard_possible_check = yes
+		tag = ELU
+	}
+
+	happened = {
+		divisions_in_state = {
+			size > 0
+			state = 90
+		}
+		divisions_in_state = {
+			size > 0
+			state = 134
+		}
+		divisions_in_state = {
+			size > 0
+			state = 73
+		}
+		divisions_in_state = {
+			size > 0
+			state = 141
+		}
+		divisions_in_state = {
+			size > 0
+			state = 142
+		}
+	}
 }