Update translation base, rename an item, fix compilation warnings

tldmod · May 26, 2021 · b9103da · b9103da
1 parent 158d010
commit b9103da
Show file tree

Hide file tree

Showing 23 changed files with 776 additions and 812 deletions.
diff --git a/Languages/_base/game_menus.csv b/Languages/_base/game_menus.csv
@@ -342,16 +342,6 @@ mno_explore|Explore this place.
 menu_ring_hunter_lair|^^^^You have followed the trail of the Ring Hunters through Mirkwood Forest and have arrived at the {s1}. You see them getting ready to leave with a chest.
 mno_attack_lair|Attack them now
 mno_leave_bandit_lair|Leave for now.
-menu_raftmen|^^^^You follow the River Running southeast towards Rhûn, hoping to find the old merchant road.^^ After some time, you arrive at a small village nestled along the riverbank.^^You ask the villagers how you might reach the road and are directed towards a pair of men who navigate the river by raft.^^It takes some negotiating but you arrange for the men to bring you downriver.
-mno_go_with_the_raftmen|Take the raft to Dorwinion
-menu_ride_to_dorwinion|^^^^You relax and enjoy the fair weather as the men steer the raft downriver. The River Running, cold and clear amidst the falls and rapids of the Lonely Mountain, here is tepid, gentle, and muddy.^^ In the afternoon sun, you watch rolling plains and verdant woodlands drift by as the raft floats along the winding meanders. The region is sparsely dotted with small farmsteads and vineyards with low stone walls and you pass the occasional stilted cottage tucked away in the reeds.^^The peaceful motion of the raft helps you drift off to sleep...
-mno_ride_to_dorwinion_next|Next...
-menu_amath_dollen_fortress|^^^^You awake from your nap late in the afternoon and shortly reach a jetty where the men moor the raft. They direct you to a narrow track that disappears into the marsh grass and set up camp to await your return.^^You follow the track, which ascends quickly from the wetlands onto a grassy plain, and walk until it meets the old merchant road.^^After some time, you see a bandit fortress.
-mno_bandit_fortress_with_companions|Approach the Bandit Fortress with only your companions and attempt to talk with their leader.
-mno_bandit_fortress_with_army|Attack the bandit fortress with all your men.
-mno_bandit_fortress_against_easterlings|Defend the Fortress against the Siege
-mno_bandit_fortress_spirits|Go talk with the spirits.
-mno_leave_amath_dollen_fortress|Leave for now.
 menu_gondor_reinforcement_event|^^^^^The beacons of Gondor are lit, Minas Tirith calls for aid!^^The lords of the southern fiefs will now march north to defend the White City against the coming darkness.
 mno_gondor_reinforcement_event_close|Close
 menu_gondor_beacons|You look up at {s1}, one of the warning beacons of Gondor, used to raise the alarm in northern and southern Gondor.

diff --git a/Languages/_base/item_kinds.csv b/Languages/_base/item_kinds.csv
@@ -490,7 +490,7 @@ itm_mirkwood_leather|Woodelf Leather Armor
 itm_mirkwood_pad|Greenwood Quilted Coat
 itm_mirkwood_mail|Greenwood Mail
 itm_mirkwood_scale|Greenwood Light Scale
-itm_mirkwood_heavy_scale|Mirkwood Leafscale
+itm_mirkwood_heavy_scale|Greenwood Leafscale
 itm_mirkwood_sword|Woodelf Sword
 itm_mirkwood_great_spear|Greenwood Great Spear
 itm_mirkwood_war_spear|Greenwood War Spear

diff --git a/Languages/_base/quick_strings.csv b/Languages/_base/quick_strings.csv
@@ -574,7 +574,6 @@ qstr_Dale_capital_moved_f|Dale capital moved from Dale to Esgaroth!
 qstr_Gundabad_capital_mov|Gundabad capital moved from Gundabad to Goblin Town!
 qstr_The_hosts_of_{s2}_re|The hosts of {s2} retreat back to their homes!
 qstr____Ruins_of_{s1}___|   Ruins of {s1}   
-qstr_{s1}_siege_attack!|{s1} siege attack!
 qstr_ranks|ranks
 qstr_shield_wall|shield wall
 qstr_wedge|wedge
@@ -633,15 +632,6 @@ qstr_have_taken_measure_o|have taken measure of your faction's current strength
 qstr_loses_Faction_Streng|loses Faction Strength as supply lines were disrupted.
 qstr_loses_Faction_Strengt|loses Faction Strength due to the destruction of their camp.
 qstr_gains_Faction_Streng|gains Faction Strength as news of your victory spreads.
-qstr_Mountain_Goblin|Mountain Goblin
-qstr_Tribal_Orc|Tribal Orc
-qstr_Tribal_Orc_Warrior|Tribal Orc Warrior
-qstr_Tribal_Orc_Chief|Tribal Orc Chief
-qstr_Mountain_Goblins|Mountain Goblins
-qstr_Tribal_Orcs|Tribal Orcs
-qstr_Tribal_Orc_Warriors|Tribal Orc Warriors
-qstr_Tribal_Orc_Chiefs|Tribal Orc Chiefs
-qstr_A_quest_was_cancelle|A quest was cancelled for update compatibility. No need to worry.
 qstr_Something_wrong_not_|Something wrong, not enough troops to remove
 qstr_Raiders|Raiders
 qstr_have_won_the_sea_bat|have won the sea battle, demoralizing your troops. The enemy may take advantage of this defeat and attack more frequently.
@@ -1097,7 +1087,6 @@ qstr_Scouts_report_that_{|Scouts report that {s6} gathered a large army in the v
 qstr_The_forces_of_{s2}_e|The forces of {s2} established an advanced camp in {s15}!
 qstr_The_hosts_of_{s2}_ma|The hosts of {s2} march back to defend their homes!
 qstr_{playername}_s_Reser|{playername}'s Reserves
-qstr_{reg70}___Last_Stand|{reg70} - Last Stand
 qstr_Gondor_has_called_fo|Gondor has called for aide!
 qstr_Gondor_is_accompanyi|Gondor is accompanying the marshall!
 qstr_{s5}_has_stopped_fol|{s5} has stopped following you.

diff --git a/Languages/_base/troops.csv b/Languages/_base/troops.csv
@@ -1563,15 +1563,6 @@ trp_start_quest_mordor_scout|Mordor Guide
 trp_start_quest_mordor_scout_pl|Mordor Guides
 trp_start_quest_beorning|Beorning Carrock Berserker
 trp_start_quest_beorning_pl|Beorning Carrock Berserkers
-trp_black_shield|Amath Dollen
-trp_black_shield_bandit|Amath Dollen's Bandit
-trp_black_shield_bandit_pl|Amath Dollen's Bandits
-trp_black_shield_scout|Amath Dollen's Scout
-trp_black_shield_scout_pl|Amath Dollen's Scouts
-trp_black_shield_guard|Amath Dollen's Guard
-trp_black_shield_guard_pl|Amath Dollen's Guards
-trp_dorwinion_spirit_leader|Spirit
-trp_dorwinion_spirit|Lesser Spirit
 trp_i6_beorning_bear_warrior|Bear Warrior
 trp_i6_beorning_bear_warrior_pl|Bear Warriors
 trp_morannon_healer|Okstuk the Healer

diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -981,7 +981,7 @@ def heraldic(item_tableau):
 ["mirkwood_pad","Greenwood_Quilted_Coat",[("mirkwood_quiltedsurcoat_01",0),("mirkwood_quiltedsurcoat_01",imodbits_armor_bad),("mirkwood_quiltedsurcoat_01_b",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,800,weight(6)|head_armor(0)|body_armor(20)|leg_armor(8)|difficulty(0),imodbits_armor|imodbit_lordly,],
 ["mirkwood_mail","Greenwood_Mail",[("mirkwood_maillewithsurcoat_01_b",0),("mirkwood_maillewithsurcoat_01",imodbits_armor_bad),("mirkwood_royal",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,2500,weight(17)|head_armor(0)|body_armor(29)|leg_armor(14)|difficulty(0),imodbits_armor|imodbit_lordly,],
 ["mirkwood_scale","Greenwood_Light_Scale",[("mirkwood_light_scale",0),("mirkwood_scalequilted_01",imodbits_armor_bad),("mirkwood_scalequilted_01b",imodbits_armor_good)],itp_type_body_armor|itp_covers_legs|itp_shop,0,1100,weight(12)|head_armor(0)|body_armor(26)|leg_armor(12)|difficulty(0),imodbits_armor|imodbit_lordly,],
-["mirkwood_heavy_scale","Mirkwood_Leafscale",[("mirkwood_scaleovermaille_01",0),],itp_type_body_armor|itp_covers_legs|itp_shop,0,4000, weight(23)|abundance(100)|head_armor(0)|body_armor(38)|leg_armor(14)|difficulty(0),imodbits_armor|imodbit_lordly,],
+["mirkwood_heavy_scale","Greenwood_Leafscale",[("mirkwood_scaleovermaille_01",0),],itp_type_body_armor|itp_covers_legs|itp_shop,0,4000, weight(23)|abundance(100)|head_armor(0)|body_armor(38)|leg_armor(14)|difficulty(0),imodbits_armor|imodbit_lordly,],
 #next two free Jan 2020
 ["free_mirkwood_armor_e","Light_Mail_and_Surcoat",[("mirkwood_maillewithsurcoat_01",0)],itp_type_body_armor|itp_covers_legs|itp_shop,0,2500,weight(17)|head_armor(0)|body_armor(25)|leg_armor(14)|difficulty(0),imodbits_elf_armor,],
 #WEAPONS##########

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -14411,10 +14411,10 @@ def set_item_score():
 	[(try_for_agents, ":agent_no"),
 		(agent_is_alive, ":agent_no"),
 		(agent_get_class, ":agent_class", ":agent_no"),
-        (agent_get_troop_id, ":agent_troop", ":agent_no"),
 
 	  ] + (is_a_wb_script==1 and [
-       (try_begin), #Kham : horse archer siege fix?
+       (try_begin), #Kham : horse archer siege fix? 
+          (agent_get_troop_id, ":agent_troop", ":agent_no"),
           (troop_is_guarantee_ranged, ":agent_troop"),
           (troop_is_guarantee_horse, ":agent_troop"),
           (troop_is_mounted, ":agent_troop"),
@@ -14431,7 +14431,7 @@ def set_item_score():
 				(agent_slot_eq, ":agent_no", slot_agent_target_entry_point, 0),
 				(agent_get_team, ":team", ":agent_no"), #0, 2, 4
                 (store_div, ":team_slot", ":team", 2),  #0, 1, 2
-                (neg|troop_slot_eq,"trp_no_troop",":team",-1), #choke point not taken
+                (neg|troop_slot_eq,"trp_no_troop",":team_slot",-1), #choke point not taken
 				(try_begin),(eq,":team",0),(store_random_in_range, ":random_entry_point", 50, 56), (ge, ":random_entry_point", 53), (assign, ":random_entry_point", 42), #left
 				 (else_try),(eq,":team",2),(store_random_in_range, ":random_entry_point", 54, 57), (ge, ":random_entry_point", 55), (assign, ":random_entry_point", 41), #center
 				 (else_try),               (store_random_in_range, ":random_entry_point", 56, 62), (ge, ":random_entry_point", 59), (assign, ":random_entry_point", 43), #right