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

Dev

additional_credits.txt

@@ -1,39 +1,55 @@
-Some parts of the textures for the unit models were taken from the following resources:
 
- - "Uruk Hai - LOTR" (https://skfb.ly/TQGw) by Ulrik Langvandsbråten
- - "Uruk armor pack" (https://skfb.ly/oxvRT) by Brice_VIARD
- - "Gondor Armour" (https://skfb.ly/6pWwH) by TheWarArmoury
- - "Medieval Civilian 3" (https://skfb.ly/6StAw) by Leonardo Carvalho
+
+# General Credits
+
+Project Owner: Helliaca
+
+Developers: TheOneAndOnly, SaeMatsumoto, blastradius14
+
+Previous developers: Count Tyme, Ryless, Devment
+
+Contributors: sealord72, Arnadex, Walther, Soviet_Cyber, yeoudal
+
+
+# 3D Models
+
+"Uruk Hai - LOTR" (https://skfb.ly/TQGw) by Ulrik Langvandsbråten
+
+"Uruk armor pack" (https://skfb.ly/oxvRT) by Brice_VIARD
+
+"Gondor Armour" (https://skfb.ly/6pWwH) by TheWarArmoury
+
+"Medieval Civilian 3" (https://skfb.ly/6StAw) by Leonardo Carvalho
 
 The tower of Orthanc model is by Alex Hilliard (https://www.tinkercad.com/users/kjkvk6FbusG-alex-hilliard-263)
 
+
+# Images and sprites
+
 Coin-stack images used for tax-policy icon from: www.quoteinspector.com
 
 Dark-Realm of Gondor flag by LordBojangles (https://www.deviantart.com/lordbojangles/art/Flag-of-Gondor-under-Sauron-186030718)
 
-Most generic portraits are generated using Midjourney (midjourney.com)
+NOTE: Several images used in this mod were generated using generative AI tools.
 
-People who helped with the focus tree icons, national spirits and flags:
-- Arnadex (discord name)
-- Walther (discord name)
-- Soviet_Cyber (discord name)
-- yeoudal (discord name)
 
-Bag End artwork (loading screen) by Tummi (Vladimir Stana) (https://www.artstation.com/artwork/lVrbez)
-Lothlorien artwork (loading screens) by Tummi (Vladimir Stana) (https://www.artstation.com/artwork/0nJZbY)
-Elven city artwork (loading screen) by Tummi (Vladimir Stana) (https://www.artstation.com/artwork/g0gZ3x)
+# Fonts
 
 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)
 
 
-Main menu background music:
- - "Lonely Mountain", by Rafael Krux (https://freepd.com/epic.php)
+# Music and Sound
+
+"Lonely Mountain", by Rafael Krux (https://freepd.com/epic.php) (main menu music)
 
 
-Main menu background picture created with the following models:
+# Main Menu Background
 
+Main menu background picture created using 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/).

common/achievements/achievements.txt

@@ -435,4 +435,15 @@ ELU_every_hole_is_home = {
 			state = 142
 		}
 	}
+}
+
+why_didnt_they_just = {
+	possible = {
+		achievement_standard_possible_check = yes
+		NOT = { tag = MOR }
+	}
+
+	happened = {
+		has_country_flag = ring_destroyed_with_eagles
+	}
 }

common/autonomous_states/autonomous_tributary.txt

@@ -10,7 +10,7 @@ autonomy_state = {
 	rule = {
 		desc = "RULE_DESC_IS_A_SUBJECT"
 
-		can_not_declare_war = no
+		can_not_declare_war = yes
 		can_decline_call_to_war = yes
 		can_be_spymaster = yes
 		contributes_operatives = yes
@@ -56,4 +56,8 @@ autonomy_state = {
 	can_lose_level = {
 		#trigger here
 	}
+
+	allowed_levels_filter = {
+		autonomy_autonomous_tributary
+	}
 }

common/autonomous_states/bulwark.txt

@@ -1,7 +1,7 @@
 autonomy_state = {
 	id = autonomy_bulwark
 
-	is_puppet = yes
+	is_puppet = no
 
 	min_freedom_level = 0.5
 
@@ -61,4 +61,8 @@ autonomy_state = {
 	can_lose_level = {
 		#trigger here
 	}
+
+	allowed_levels_filter = {
+		autonomy_bulwark
+	}
 }

common/decisions/_debug_decisions.txt

@@ -238,15 +238,21 @@ debug_decisions = {
 			is_debug = yes
 			#num_of_civilian_factories > 35
 			#arms_factory > 13
-			has_idea = one_true_ring
+			#has_idea = one_true_ring
 		}
 
 		visible = { always = yes }
 		fire_only_once = no
 		cost = 0
 
 		complete_effect = {
-			white_peace = ROH
+			ISE = {
+				set_autonomy = {
+					target = ROH
+					autonomy_state = autonomy_bulwark
+					#autonomy_autonomous_tributary
+				}
+			}
 		}
 	}
 

common/game_rules/00_game_rules.txt

@@ -844,5 +844,21 @@ enable_ring_mechanic = {
 		allow_achievements = no
 	}
 }
+cohesive_factions_restriction = {
+	name = "COHESIVE_FACTIONS_RESTRICTION"
+	group = "LOTR_MOD_RULES"
+	default = {
+		name = YES
+		text = "COHESIVE_FACTIONS_RESTRICTION_YES"
+		desc = "COHESIVE_FACTIONS_RESTRICTION_YES_DESC"
+		allow_achievements = yes
+	}
+	option = {
+		name = NO
+		text = "COHESIVE_FACTIONS_RESTRICTION_NO"
+		desc = "COHESIVE_FACTIONS_RESTRICTION_NO_DESC"
+		allow_achievements = no
+	}
+}
 
 #We could add stuff for political advisor visibility filters here too, in the future

common/on_actions/00_on_actions.txt

@@ -355,6 +355,10 @@ on_actions = {
 	#Not run on a specific country.
 	on_startup = {
 		effect = {
+			# NOTE: This flag is used to load tech trees for countries that get them later (switch_to_orcs). 
+			# It is a workaround for a bug that was introduced in the Götterdämmerung patch. If this bug is fixed later on, please get rid of this!
+			set_global_flag = game_has_started
+
 			ROH = {
 				if = {
 					limit = {

common/raids/destroy_ring_air.txt

@@ -138,6 +138,10 @@ types = {
 					}
 				}
 				actor_effects = {
+					var:actor_country = {
+						set_country_flag = ring_destroyed_with_eagles
+						ring_remove_ring = yes
+					}
 					raid_damage_units = {
 						plane_loss = 1.0
 						ratio = yes
@@ -157,6 +161,7 @@ types = {
 					}
 					raid_add_unit_experience = 0.75
 					var:actor_country = {
+						set_country_flag = ring_destroyed_with_eagles
 						ring_remove_ring = yes
 					}
 				}
@@ -178,6 +183,7 @@ types = {
 					}
 					raid_add_unit_experience = 1.0
 					var:actor_country = {
+						set_country_flag = ring_destroyed_with_eagles
 						ring_remove_ring = yes
 					}
 				}

common/scripted_effects/00_lotr_races_scripted_effects.txt

@@ -15,6 +15,8 @@ lotr_switch_to_orcs = {
 
 	set_country_flag = has_switched_to_orcs # This unlocks the researcher advisors (see ideas/zzz_lotr_advisors_orcs_switcheroo)
 
+	mark_technology_tree_layout_dirty = yes
+
 }
 
 
@@ -33,6 +35,8 @@ lotr_switch_to_spiders = {
 	}
 
 	load_oob = "spider_generic_templates"
+
+	mark_technology_tree_layout_dirty = yes
 }
 
 

common/scripted_effects/lotr_generic_scripted_effects.txt

@@ -602,4 +602,4 @@ add_ruling_party_support = {
             popularity = 0.1
         }
     }
-}
+}

common/scripted_triggers/diplomacy_scripted_triggers.txt

@@ -670,9 +670,17 @@ DIPLOMACY_JOIN_FACTION_ENABLE_TRIGGER = {
 			always = no
 		}
 	}
-	OR = {
-		FROM = { has_common_enemy = yes }
-		FROM = { in_faction_neighbouring_root = yes }
+	if = {
+		limit = {
+			has_game_rule = {
+				rule = cohesive_factions_restriction
+				option = YES
+			}
+		}
+		OR = {
+			FROM = { has_common_enemy = yes }
+			FROM = { in_faction_neighbouring_root = yes }
+		}
 	}
 }
 DIPLOMACY_OFFER_JOIN_FACTION_ENABLE_TRIGGER = {
@@ -692,9 +700,17 @@ DIPLOMACY_OFFER_JOIN_FACTION_ENABLE_TRIGGER = {
 			always = no
 		}
 	}
-	OR = {
-		FROM = { has_common_enemy = yes }
-		FROM = { has_neighbour_in_roots_faction = yes }
+	if = {
+		limit = {
+			has_game_rule = {
+				rule = cohesive_factions_restriction
+				option = YES
+			}
+		}
+		OR = {
+			FROM = { has_common_enemy = yes }
+			FROM = { has_neighbour_in_roots_faction = yes }
+		}
 	}
 }
 DIPLOMACY_CREATE_FACTION_ACTION_ENABLE_TRIGGER = {

common/technology_tags/00_technology.txt

@@ -234,7 +234,13 @@ technology_folders = {
 	}
 	orcs_special_folder = {
 		available = {
-			is_orcs = yes
+			OR = {
+				is_orcs = yes
+				AND = {
+					can_switch_to_orcs = yes
+					NOT = { has_global_flag = game_has_started }
+				}
+			}
 		}
 	}
 	elves_special_folder = {

description.txt

@@ -24,22 +24,22 @@ NOTE: This mod is best played on a screen with a resolution of 1920x1080 or high
 
 [h1]FAQ[/h1]
 
-*What are the strange white squares on my screen?*
+[i]What are the strange white squares on my screen?[/i]
 They are a graphical glitch that we haven't figured out how to fix yet. To get rid of them, you can switch your Renderer to DirectX9 in the launcher settings.
 
-*How do I win the Moria Civil War?*
+[i]How do I win the Moria Civil War?[/i]
 There are many things you can do, and it is consistently winnable. The most important things are to use Oin as your general, to stack production efficiency techs, entrench yourself from day 1 and *not* to use Last Stand.
 
-*How do I get the Ring as [insert country name]?*
+[i]How do I get the Ring as [insert country name]?[/i]
 Getting the ring is not something that can be done consistently, and depends largely on luck. There are however some things you can do to increase your chances. Make sure to assemble your hunting party sensibly. Selecting *all* available generals isn't always the most sensible thing to do. Some countries also have additional focuses and decisions to help them on their interceptions.
 
-*What are some good templates?*
+[i]What are some good templates?[/i]
 We try to keep things balanced and hope to avoid a situation in which there is one template to rule them all. But in general, commonly used frontline infantry units tend to be comprised of infantry and archers in a 7-2 or 9-1 ratio. Try experimenting around with some of our new unit types. That's part of the fun!
 
-*Can I play this Multiplayer?*
+[i]Can I play this Multiplayer?[/i]
 Yes, the mod is multiplayer compatible. We generally try to keep things more-or-less balanced, but due to our small team, that isn't always the case.
 
-*Is this mod compatible with [insert other mod]?*
+[i]Is this mod compatible with insert other mod?[/i]
 Some mods, like music mods and a few others are compatible. But our mod changes *a lot* of files, and is unlikely to be compatible with the vast majority of other mods.
 
 [img]https://i.imgur.com/TZYFk0D.png[/img]
@@ -82,4 +82,4 @@ https://discord.gg/XdQ3GbACPW
 [img]https://i.imgur.com/TZYFk0D.png[/img]
 
 [h2]Disclaimer[/h2]
-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).
+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).