Add missing guildmaster string for Ufthak; Correct a few types and gr…

…ammar errors.
tldmod · Oct 20, 2020 · a4bca3e · a4bca3e
1 parent b346bdc
commit a4bca3e
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 28 deletions.
diff --git a/ModuleSystem/ID/ID_strings.py b/ModuleSystem/ID/ID_strings.py
@@ -2688,5 +2688,6 @@
 str_imladris_guildmaster_companion_player_none_ok = 2687
 str_imladris_guildmaster_player_found_ok = 2688
 str_show_keybinds_form = 2689
+str_mordor_cungol_guildmaster_companion = 2690
 
 
diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
@@ -1552,7 +1552,7 @@
  ("go_back",[],"Go back"  ,[(jump_to_menu, "mnu_start_gondor")]),    ]
  ),
 ( "start_haradrim",menu_text_color(0xFF000000)|mnf_disable_all_keys,
- "^^^^^^^You are an Haradrim,^a Man of the Desert.^Select your line", "none",[(assign, "$last_menu", "mnu_start_haradrim")],[
+ "^^^^^^^You are one of the Haradrim,^a Man of the Desert.^Select your line", "none",[(assign, "$last_menu", "mnu_start_haradrim")],[
  ("start_1_des",[],"Desert Man",                          [(call_script,"script_start_as_one","trp_i1_harad_levy"),   (jump_to_menu,"mnu_choose_gender"),]),
  ("start_2_far",[],"Far Harad Tribesman",                 [(call_script,"script_start_as_one","trp_i2_far_harad_tribesman"),    (jump_to_menu,"mnu_choose_gender"),]),
 # ("start_3",[],"Harondor Noble",                      [(call_script,"script_start_as_one","trp_c2_harondor_scout"),(jump_to_menu,"mnu_choose_gender"),]),

diff --git a/ModuleSystem/module_presentations.py b/ModuleSystem/module_presentations.py
@@ -4054,7 +4054,7 @@
 
     #URUK
     #text
-     (create_text_overlay, "$g_option_evil_text", "@an URUK-HAI,^ bred in Isengard", tf_center_justify),
+     (create_text_overlay, "$g_option_evil_text", "@one of the URUK-HAI,^ bred in Isengard", tf_center_justify),
         (position_set_x, pos1, 480),
         (position_set_y, pos1, 230),
         (overlay_set_position, "$g_option_evil_text", pos1),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -22053,14 +22053,19 @@ def set_item_score():
       (str_store_faction_name, s2, "$players_kingdom"),
       (faction_get_slot, ":player_king", "$players_kingdom", slot_faction_leader),
       (str_store_troop_name, s3, ":player_king"),
+	  (troop_get_type, reg3, ":player_king"),
+       (try_begin),
+         (gt, reg3, 1), #MV: non-humans are male
+         (assign, reg3, 0),
+      (try_end),
       (faction_get_slot, ":nearest_king", ":nearest_faction", slot_faction_leader),
       (str_store_troop_name, s4, ":nearest_king"),
 
-      (str_store_string, s50, "@Ah, what a coincidence, running into you, {playername}! You might not know me, but are not unknown to me. I am on my way to {s4}, but I have just come from {s3} and your name has come up. {s3} is counting on you in these perilous times and if you had thought to pursue some distracting course of action, you might wish to reconsider it and focus on aiding {s3} to your utmost capabilities."),
+      (str_store_string, s50, "@Ah, what a coincidence, running into you, {playername}! You might not know me, but are not unknown to me. I am on my way to {s4}, but I have just come from {s3} and your name has come up. {s3} is counting on you in these perilous times and if you had thought to pursue some distracting course of action, you might wish to reconsider it and focus on aiding {s2} to your utmost capabilities."),
       (str_store_string, s51, "@Who are you?"),
       (str_store_string, s52, "@A friend of {s3} and the people of {s2}. Now hurry! Mordor draws all wicked things, and the Dark Power is bending all its will to gather them there. Time is running out for all that is good in this world, unless we make count our every action to oppose it!"),
       (str_store_string, s53, "@What should I do?"),
-      (str_store_string, s54, "@Find {s3}'s whereabouts immediately and speak with him. Good luck!"),
+      (str_store_string, s54, "@Find {s3}'s whereabouts immediately and speak with {reg3?her:him}. Good luck!"),
       (assign, "$g_tld_convo_lines", 5),
       (val_or, "$g_tld_conversations_done", tld_conv_bit_gandalf_advice),
     (else_try),
@@ -26284,8 +26289,10 @@ def set_item_score():
 	(try_end),
 
 	(troop_set_slot, "trp_elder_mmorgul", slot_troop_gm_companion_1, "str_mordor_morgul_guildmaster_companion"),
+	(troop_set_slot, "trp_elder_cungol", slot_troop_gm_companion_1, "str_mordor_cungol_guildmaster_companion"),
 
 	(party_set_slot, "p_town_minas_morgul", slot_party_has_companion, 1),
+	(party_set_slot, "p_town_cirith_ungol", slot_party_has_companion, 1),
 
 	# Harad
 	(try_for_range, ":harad_guildmasters", "trp_elder_harad", "trp_elder_rhun"),

diff --git a/ModuleSystem/module_strings.py b/ModuleSystem/module_strings.py
@@ -1402,7 +1402,7 @@
   ("npc4_home_description_2", "We would do well to remember the great deeds of the past and the sacrifices that were made. The Alliance between Rohan and Gondor shall save our peoples from doom once again."),
   ("npc5_home_description_2", "Let it be a reminder that even the greatest, even one of the Istari, can be corrupted and fall. Those who lust for power can be defeated by power, so let us not tarry much longer."),
   ("npc6_home_description_2", "I sense the evil armies behind its walls prepare to march... To fair Lothlórien? To Dale? To my Greenwood homeland? I cannot tell, but please do everything you can to thwart them."),
-  ("npc7_home_description_2", "If the fates of war ever provide us with a large army, we should risk the entrance to the Mines and retrieve their mighty riches."),
+  ("npc7_home_description_2", "If the fortunes of war ever provide us with a large army, we should risk the entrance to the Mines and retrieve their mighty riches."),
   ("npc8_home_description_2", "I can smell the fragrance of many sweet flowers and see the bees harvesting their nectar. If you don't mind, I will gather some herbs for our own use, it will only take a moment."),
   ("npc9_home_description_2", "There's no use trudging around here if we are not backed by a large Uruk-hai horde. Unless you want to make faces at the lookouts on the wall, that is."),
   ("npc10_home_description_2", "Minas Morgul, where Nazgul drink all day, har-har!"),
@@ -3586,7 +3586,7 @@
 ("npc21_home_description_2", "We would do well to remember the great deeds of the past and the sacrifices that were made. The Alliance between Rohan and Gondor shall save our peoples from doom once again."),
 ("npc22_home_description_2", "Let it be a reminder that even the greatest, even one of the Istari, can be corrupted and fall. Those who lust for power can be defeated by power, so let us not tarry much longer."),
 ("npc23_home_description_2", "I sense the evil armies behind its walls prepare to march... To fair Lothlórien? To Dale? To my Greenwood homeland? I cannot tell, but please do everything you can to thwart them."),
-("npc24_home_description_2", "If the fates of war ever provide us with a large army, we should risk the entrance to the Mines and retrieve their mighty riches."),
+("npc24_home_description_2", "If the fortunes of war ever provide us with a large army, we should risk the entrance to the Mines and retrieve their mighty riches."),
 ("npc25_home_description_2", "I can smell the fragrance of many sweet flowers and see the bees harvesting their nectar. If you don't mind, I will gather some herbs for our own use, it will only take a moment."),
 ("npc26_home_description_2", "There's no use trudging around here if we are not backed by a large Uruk-hai horde. Unless you want to make faces at the lookouts on the wall, that is."),
 ("npc27_home_description_2", "Minas Morgul, where Nazgul drink all day, har-har!"),
@@ -3750,4 +3750,7 @@
 
 # Show Keybind for New Form
 ("show_keybinds_form", "Special Key Bindings: ^^ Formation Keys:^ Use F1-F4 to order selected divisions. ^Keep the F1 key down to place selected divisions.^Place on enemy division to target.^^ Cycle Through Weapon Usage - O ^^ Cycle Through Camera Type - CTRL+END ^^ Rally - V ^^ Call Horse - M ^^ View Orders / Minimap - Backspace"),
+
+#Mordor Orc patrol camp (internally named cirith ungol) Companion added down here for savegame compat.
+("mordor_cungol_guildmaster_companion", "O ho, you want a fighter! I’ve got just the lad for you. He’s a favourite of the Big Bosses, that one. Do not be deceived by his small stature, oh no! Why, I warrant he’d be a Boss himself before too long, the way he’s been carrying on! Just put a nice big axe in old Ufthak’s hands, put him right in the front, and watch him go! Cause the enemy no end of grief, he will, and no mistake! ‘Ere, pipe down, lads! What’re you laughing about? Go on about your rounds, you maggots! Sorry about that, Commander, these louts are an undisciplined lot. Not like Ufthak! Take him along, Commander, you won’t regret it. You can trust Ufthak with your very life. See, there he stands his watch, atop the tower. Cuts a majestic figure, eh?"),
 ]
diff --git a/ModuleSystem/module_triggers.py b/ModuleSystem/module_triggers.py
@@ -1637,7 +1637,7 @@
 
         (try_begin),
           (neg|faction_slot_eq, ":target", slot_faction_state, sfs_active),
-          (str_store_string, s22, "@Your troops value your effort to fullfill your oath, but acknowledge that events unfolded too quick. As a result, "),
+          (str_store_string, s22, "@Your troops value your effort to fulfill your oath, but acknowledge that events unfolded too quickly. As a result, "),
         (else_try),
           (faction_slot_eq, ":target", slot_faction_state, sfs_active),
           (str_store_string, s22, "@ "),

diff --git a/_wb/menus.txt b/_wb/menus.txt
@@ -52,7 +52,7 @@ menu_start_hand_orc 18374686479671624192 ^^^^^^^^^^Where_do_you_lurk? none 1 213
  mno_quick_start_moria  1 31 2 1 1  [dev:_quick_start_Moria]  4 2133 2 144115188075855989 0 2133 2 144115188075855988 0 1 2 253 374 2060 1 1  .  mno_start_armis  0  in_the_Armies_amassed_at_ISENGARD  2 1 2 253 314 2060 1 30  .  mno_start_minmo  0  in_the_Mines_of_MORIA  2 1 2 253 374 2060 1 30  .  mno_start_cliff  0  in_the_cliffs_of_Mount_GUNDABAD  2 1 2 253 382 2060 1 30  .  mno_spacer  0  _  0  .  mno_go_back  0  Go_back  1 900 1 26  . 
 menu_start_gondor_mt 18374686479671624192 ^^^^^^^^^^Select_your_Lineage none 1 2133 2 144115188075855974 25 4
  mno_start_1_com  0  Commoner  2 1 2 253 101 2060 1 28  .  mno_start_2_hib  0  High-born  2 1 2 253 110 2060 1 28  .  mno_spacer  0  _  0  .  mno_go_back  0  Go_back  1 2060 1 20  . 
-menu_start_haradrim 18374686479671624192 ^^^^^^^You_are_an_Haradrim,^a_Man_of_the_Desert.^Select_your_line none 1 2133 2 144115188075855974 26 4
+menu_start_haradrim 18374686479671624192 ^^^^^^^You_are_one_of_the_Haradrim,^a_Man_of_the_Desert.^Select_your_line none 1 2133 2 144115188075855974 26 4
  mno_start_1_des  0  Desert_Man  2 1 2 253 247 2060 1 28  .  mno_start_2_far  0  Far_Harad_Tribesman  2 1 2 253 263 2060 1 28  .  mno_spacer  0  _  0  .  mno_go_back  0  Go_back  1 2060 1 21  . 
 menu_start_numenorean 18374686479671624192 ^^^^^^^You_are_a_Black_Numenorean,^faithful_to_the_Darkness_and_Morgoth.^Select_where_you_serve_the_Eye none 1 2133 2 144115188075855974 27 4
  mno_start_1_bn  0  Next_to_the_Mouth_of_Sauron,_in_MORANNON  1 2060 1 28  .  mno_start_2_bn  0  In_the_Fortress_of_the_Necromancer,_DOL_GULDUR  2 1 2 254 17 2060 1 28  .  mno_spacer  0  _  0  .  mno_go_back  0  Go_back  1 2060 1 21  . 

diff --git a/_wb/quick_strings.txt b/_wb/quick_strings.txt
@@ -82,9 +82,9 @@ qstr_an_ORC^_serving_the_ an_ORC,^_serving_the_Lidless_Eye
 qstr_an_URUK^_the_new_bre an_URUK,^_the_new_breed_of_Orcs
 qstr_a_MAN^_subjugated_by a_MAN,^_subjugated_by_Sauron
 qstr_an_ORC^_serving_the_W an_ORC,^_serving_the_White_Hand
-qstr_an_URUK_HAI^_bred_in an_URUK-HAI,^_bred_in_Isengard
+qstr_one_of_the_URUK_HAI^ one_of_the_URUK-HAI,^_bred_in_Isengard
 qstr_a_MAN_of_Dunland^_th a_MAN_of_Dunland,^_the_Western_Plains
-qstr__rev_99_wb__dev_^_Bu _rev_99_wb_|_dev_^_Built_2020-10-17_18:59___
+qstr__rev_101_wb__dev_^_B _rev_101_wb_|_dev_^_Built_2020-10-20_17:46___
 qstr_Click_the_center_but Click_the_center_button_to_toggle_faction^Click_the_avatars_to_view_details_of_them
 qstr_Level:_{reg3}^Health Level:_{reg3}^Health:_{reg4}
 qstr_Attributes Attributes
@@ -575,11 +575,11 @@ qstr_Inappropriate_mount Inappropriate_mount
 qstr_{s24}:_Your_infantry {s24}:_Your_infantry_feels_better!
 qstr_{s24}:_Your_archers_ {s24}:_Your_archers_feel_better!
 qstr_{s24}:_Your_cavalry_ {s24}:_Your_cavalry_feels_better!
-qstr_Ah_what_a_coincidenc Ah,_what_a_coincidence,_running_into_you,_{playername}!_You_might_not_know_me,_but_are_not_unknown_to_me._I_am_on_my_way_to_{s4},_but_I_have_just_come_from_{s3}_and_your_name_has_come_up._{s3}_is_counting_on_you_in_these_perilous_times_and_if_you_had_thought_to_pursue_some_distracting_course_of_action,_you_might_wish_to_reconsider_it_and_focus_on_aiding_{s3}_to_your_utmost_capabilities.
+qstr_Ah_what_a_coincidenc Ah,_what_a_coincidence,_running_into_you,_{playername}!_You_might_not_know_me,_but_are_not_unknown_to_me._I_am_on_my_way_to_{s4},_but_I_have_just_come_from_{s3}_and_your_name_has_come_up._{s3}_is_counting_on_you_in_these_perilous_times_and_if_you_had_thought_to_pursue_some_distracting_course_of_action,_you_might_wish_to_reconsider_it_and_focus_on_aiding_{s2}_to_your_utmost_capabilities.
 qstr_Who_are_you? Who_are_you?
 qstr_A_friend_of_{s3}_and A_friend_of_{s3}_and_the_people_of_{s2}._Now_hurry!_Mordor_draws_all_wicked_things,_and_the_Dark_Power_is_bending_all_its_will_to_gather_them_there._Time_is_running_out_for_all_that_is_good_in_this_world,_unless_we_make_count_our_every_action_to_oppose_it!
 qstr_What_should_I_do? What_should_I_do?
-qstr_Find_{s3}_s_whereabo Find_{s3}'s_whereabouts_immediately_and_speak_with_him._Good_luck!
+qstr_Find_{s3}_s_whereabo Find_{s3}'s_whereabouts_immediately_and_speak_with_{reg3?her:him}._Good_luck!
 qstr_Good_to_see_the_Shad Good_to_see_the_Shadow_has_not_yet_managed_to_defeat_you,_{playername}.
 qstr_You_are_the_one_they You_are_the_one_they_call_Gandalf_or_Mithrandir.
 qstr_That_is_what_some_ca That_is_what_some_call_me._In_my_times_I_have_also_been_called_other_things,_but_unless_the_Darkness_is_stopped,_soon_there_may_not_be_anyone_left_to_call_me_anything_at_all.
@@ -1328,7 +1328,7 @@ qstr_{s27}:_Party_morale_ {s27}:_Party_morale_increased.
 qstr_{s27}:_Party_morale_d {s27}:_Party_morale_decreased.
 qstr_You_have_failed_to_f You_have_failed_to_fulfill_your_oath_to_avenge_Balin_and_his_company!
 qstr_You_have_failed_to_fu You_have_failed_to_fulfill_your_oath_of_vengeance_for_{s1}'s_heroic_death!
-qstr_Your_troops_value_yo Your_troops_value_your_effort_to_fullfill_your_oath,_but_acknowledge_that_events_unfolded_too_quick._As_a_result,_
+qstr_Your_troops_value_yo Your_troops_value_your_effort_to_fulfill_your_oath,_but_acknowledge_that_events_unfolded_too_quickly._As_a_result,_
 qstr_{s22}You_have_fulfil {s22}You_have_fulfilled_your_oath_to_avenge_Balin_and_his_company!
 qstr_{s22}You_have_fulfill {s22}You_have_fulfilled_your_oath_of_vengeance_for_{s1}'s_heroic_death!
 qstr_Reinforcements Reinforcements