*fix to intro strings + script error with shit elves tactic

tldmod · Apr 16, 2018 · e6c0a6b · e6c0a6b
1 parent 8080ee7
commit e6c0a6b
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 14 deletions.
diff --git a/ModuleSystem/ID/ID_strings.py b/ModuleSystem/ID/ID_strings.py
@@ -2283,5 +2283,6 @@
 str_dunland_extra_info = 2282
 str_beorn_extra_info = 2283
 str_intro_strings_extra_end = 2284
+str_gundabad_intro = 2285
 
 
diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
@@ -127,7 +127,7 @@
 ( "start_phase_2",mnf_disable_all_keys,
     "^^^^^______________Middle Earth. A shadow is growing in the East, ^______________and dark things come forth that have long been hidden. ^______________The free peoples prepare for war, the like of which has not been seen for an age. ^______________Men, Elves, Dwarves and Orcs; all will play their part. ^^______________What part, however, remains to be seen... ",
     "none",
-   [#(set_background_mesh, "mesh_ui_default_menu_window"),
+   [(set_background_mesh, "mesh_ui_default_menu_window"),
 	(assign, "$tld_game_options",0),
 	(try_begin), (eq,"$start_phase_initialized",0),(assign,"$start_phase_initialized",1), # do this only once
 		(set_show_messages,0),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -23874,7 +23874,15 @@ def set_item_score():
 #input: faction_id
 ("get_intro_text",[
     (store_script_param, ":faction_id", 1),
-    (store_add, ":intro_string", ":faction_id", 2207), 
+    (store_add, ":intro_string", ":faction_id", 2207),
+    (try_begin),
+    	(this_or_next|eq, ":faction_id", "fac_beorn"),
+    	(eq, ":faction_id", "fac_dunland"),
+    	(val_sub, ":intro_string", 1), 
+    (else_try),
+    	(eq, ":faction_id", "fac_gundabad"),
+    	(assign, ":intro_string", "str_gundabad_intro"),
+    (try_end),
     (str_store_string, s5, ":intro_string"),
 
     (store_add, ":intro_string_2", ":faction_id", 2225),

diff --git a/ModuleSystem/module_scripts_form.py b/ModuleSystem/module_scripts_form.py
@@ -51,15 +51,21 @@
 	(call_script, "script_battlegroup_get_size", ":team_no", grc_archers),
 
 	#Shit, Elves! Tactic - kham
-	(store_faction_of_party, ":ally_elf", "$g_ally_party"),
+	(try_begin),
+		(gt, "$g_ally_party", 0),
+		(store_faction_of_party, ":ally_elf", "$g_ally_party"),
+	(try_end),
 	(store_faction_of_party, ":enemy_elf", "$g_enemy_party"),
 	(store_faction_of_party, ":player_elf", "p_main_party"),
 	(team_get_leader, ":elf_leader", ":team_no"),
 	(agent_get_troop_id, ":agent_troop", ":elf_leader"),
 	(store_troop_faction, ":team_is_elf", ":agent_troop"),
 	(assign, ":shit_elves", 0),
 	(try_begin),
-		(this_or_next|is_between, ":ally_elf", "fac_lorien", "fac_dale"),
+		(gt, ":ally_elf", 0),
+		(is_between, ":ally_elf", "fac_lorien", "fac_dale"),
+		(assign, ":shit_elves", 1),
+	(else_try),
 		(is_between, ":player_elf", "fac_lorien","fac_dale"),
 		(assign, ":shit_elves", 1),
 	(else_try),

diff --git a/ModuleSystem/module_strings.py b/ModuleSystem/module_strings.py
@@ -3310,4 +3310,9 @@
 
 ("intro_strings_extra_end", "Intro EXTRA END"),
 
+("gundabad_intro", "You have come from the far north, from the lands of long-lost Angmar, after receiving tidings of the war to come. For years beyond count you and your folk have broken many dwarf shields with your axes and spears, crushed many broken bodies of men and elves below the claws of your fierce wargs, skinned the hides of the bear-people to wear as furs. The great halls of Gundabad in the Misty Mountains are now yours once again, as they were in the time of Bolg and Azog.^^\
+Many of you have perished over the years, somemany of them slain in these very halls and tunnels - but many still remain. Great sport you have had with the greedy little diggers and their friends, in the past - and greater sport you will have now, when you march upon them and take everything for yourselves!^^\
+Vengeance for Bolg, for Azog, for the Great Goblin - vengeance for the goblins of Gundabad!"),
+
+
 ]
diff --git a/_wb/menus.txt b/_wb/menus.txt
@@ -2,7 +2,7 @@ menusfile version 1
  240
 menu_start_game_1 18374686479671624192 ^^^^^^^^^^What_do_you_fight_for? none 10 2031 1 2 1107 1 0 4 0 75 1 42 727 2 1224979098644774912 42 2147483680 2 1224979098644774912 0 2133 2 144115188075855982 1 3 0 1 1 327 2133 2 144115188075855955 0 8
  mno_start_good  0  the_DAWN_of_a_new_Era  1 2060 1 12  .  mno_start_evil  0  the_TWILIGHT_of_Man  1 2060 1 13  .  mno_spacer  0  _  0  .  mno_faction_intros  0  Learn_about_the_different_factions_of_Middle-Earth  1 900 1 19  .  mno_spacer  0  _  0  .  mno_go_bback  0  Go_Back  1 2055 0  .  mno_quick  1 31 2 1 1  [dev:_quick_start_Gondor]  2 1 2 253 101 2060 1 1  .  mno_quick2  1 31 2 1 1  [dev:_quick_start_Mordor]  2 1 2 253 344 2060 1 1  . 
-menu_start_phase_2 512 ^^^^^______________Middle_Earth._A_shadow_is_growing_in_the_East,_^______________and_dark_things_come_forth_that_have_long_been_hidden._^______________The_free_peoples_prepare_for_war,_the_like_of_which_has_not_been_seen_for_an_age._^______________Men,_Elves,_Dwarves_and_Orcs;_all_will_play_their_part._^^______________What_part,_however,_remains_to_be_seen..._ none 29 2133 2 144115188075856582 0 4 0 31 2 144115188075855956 0 2133 2 144115188075855956 1 1107 1 0 1 1 6 1 1 1 1528 2 0 50 522 3 72057594037927956 144115188075855993 154 6 3 1224979098644774912 18 96 132 1 1224979098644774912 541 3 1224979098644774912 260 0 32 2 144115188075856342 0 2204 2 72057594037927951 1224979098644774912 31 2 72057594037927951 144115188075855993 541 3 1224979098644774912 67 144115188075856342 2133 2 72057594037927956 1224979098644774912 2133 2 1224979098644774912 96 3 0 1 4 181 0 72057594037927956 5 2133 2 144115188075855957 16 2133 2 144115188075855958 5 2133 2 144115188075855959 144115188075855993 2133 2 144115188075855960 0 2133 2 144115188075855961 -1 1 1 2 3 0 1 2 265 0 1 2 263 144115188075855993 7
+menu_start_phase_2 512 ^^^^^______________Middle_Earth._A_shadow_is_growing_in_the_East,_^______________and_dark_things_come_forth_that_have_long_been_hidden._^______________The_free_peoples_prepare_for_war,_the_like_of_which_has_not_been_seen_for_an_age._^______________Men,_Elves,_Dwarves_and_Orcs;_all_will_play_their_part._^^______________What_part,_however,_remains_to_be_seen..._ none 30 2031 1 0 2133 2 144115188075856582 0 4 0 31 2 144115188075855956 0 2133 2 144115188075855956 1 1107 1 0 1 1 6 1 1 1 1528 2 0 50 522 3 72057594037927956 144115188075855993 154 6 3 1224979098644774912 18 96 132 1 1224979098644774912 541 3 1224979098644774912 260 0 32 2 144115188075856342 0 2204 2 72057594037927951 1224979098644774912 31 2 72057594037927951 144115188075855993 541 3 1224979098644774912 67 144115188075856342 2133 2 72057594037927956 1224979098644774912 2133 2 1224979098644774912 96 3 0 1 4 181 0 72057594037927956 5 2133 2 144115188075855957 16 2133 2 144115188075855958 5 2133 2 144115188075855959 144115188075855993 2133 2 144115188075855960 0 2133 2 144115188075855961 -1 1 1 2 3 0 1 2 265 0 1 2 263 144115188075855993 7
  mno_go_forth  0  __________Go_forth_upon_your_chosen_path...  7 1 1 170 1672 2 0 72057594037927936 2133 2 144115188075855962 138 2133 2 144115188075856582 1 1533 1 0 1511 1 0 2060 1 169  .  mno_spacer  0  _  0  .  mno_change_tld_options  0  Change_TLD_options.  1 900 1 24  .  mno_spacer  0  _  0  .  mno_cheat00  4 31 2 1 1 1561 3 1224979098644774912 144115188075856341 0 32 2 1224979098644774912 0 2322 2 21 1224979098644774912  CHEAT:_become_a_{s21}  3 1561 3 1224979098644774912 144115188075856341 0 1 2 253 1224979098644774912 2060 1 1  .  mno_cheat01  4 31 2 1 1 1561 3 1224979098644774912 144115188075856341 1 32 2 1224979098644774912 0 2322 2 21 1224979098644774912  CHEAT:_become_a__{s21}  3 1561 3 1224979098644774912 144115188075856341 1 1 2 253 1224979098644774912 2060 1 1  .  mno_cheat03  2 31 2 1 1 2323 2 21 144115188075856341  CHEAT:_add_10_{s21}_to_party  1 1610 3 0 144115188075856341 10  . 
 menu_start_game_3 512 ^^^^^^^^Choose_your_scenario: none 14 500 3 842 126 4280361505 500 3 842 127 4280361505 500 3 842 128 4281219856 500 3 842 129 4282539387 500 3 842 130 4281943560 2133 2 144115188075855963 40 2133 2 144115188075855964 315 2133 2 144115188075855965 10 2133 2 144115188075855966 107 2133 2 144115188075855957 16 2133 2 144115188075855958 5 2133 2 144115188075855959 3 2133 2 144115188075855960 0 2031 1 333 15
  mno_custom_battle_scenario_1  0  Skirmish,_Gondor_factions_vs_Harad  2 2133 2 144115188075855967 1 2060 1 5  .  mno_custom_battle_scenario_12  0  Choose_factions_for_battle  2 2133 2 144115188075855967 16 2060 1 190  .  mno_custom_battle_scenario_3  0  Skirmish,_Elves_vs_Black_Numenoreans  2 2133 2 144115188075855967 2 2060 1 5  .  mno_custom_battle_scenario_4  0  Helms_Deep_Defense,_Rohan_vs_Isengard  2 2133 2 144115188075855967 3 2060 1 5  .  mno_custom_battle_scenario_5  0  Skirmish,_North_factions_vs_Rhun  2 2133 2 144115188075855967 4 2060 1 5  .  mno_custom_battle_scenario_6  1 31 2 1 1  Siege_Attack,_Orcs_vs_Dwarves  2 2133 2 144115188075855967 5 2060 1 5  .  mno_custom_battle_scenario_7  0  Ambush,_Orcs_vs_Mirkwood  2 2133 2 144115188075855967 6 2060 1 5  .  mno_custom_battle_scenario_11  0  Test_Battles_(Tune_Balancing!)  1 2060 1 7  .  mno_custom_battle_scenario_10  0  Scenery_test_battle  2 2133 2 144115188075855967 9 2060 1 5  .  mno_troll_battle_scenario  0  Test_Troll_Battles  1 2060 1 10  .  mno_warg_battle_scenario  0  Test_Warg_Battles  1 2060 1 11  .  mno_choose_scene  0  **_Scene_Chooser_**  1 2060 1 208  .  mno_build_your_own_scene  0  **_Build_your_own_scene_for_TLD_**  1 2060 1 207  .  mno_dressing_room  1 31 2 1 1  Dressing_Room  2 2133 2 144115188075855967 99 2060 1 5  .  mno_go_back  0  Go_back  1 2055 0  . 

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/_wb/strings.txt b/_wb/strings.txt
@@ -1,5 +1,5 @@
 stringsfile version 1
-2285
+2286
 str_no_string NO_STRING!
 str_empty_string _
 str_yes Yes.
@@ -2285,3 +2285,4 @@ str_gundabad_extra_info Saruman^^Very_Hard^^North_Rhovanion_(North)^^Master_Burz
 str_dunland_extra_info Saruman^^Hard^^Rohan_(South-West)^^Chief_Daeglaf_the_Black^^Rohan
 str_beorn_extra_info Good^^Hard^^North_Rhovanion_(North)^^Chief_Grimbeorn_the_Old^^Rhun,_Gundabad
 str_intro_strings_extra_end Intro_EXTRA_END
+str_gundabad_intro You_have_come_from_the_far_north,_from_the_lands_of_long-lost_Angmar,_after_receiving_tidings_of_the_war_to_come._For_years_beyond_count_you_and_your_folk_have_broken_many_dwarf_shields_with_your_axes_and_spears,_crushed_many_broken_bodies_of_men_and_elves_below_the_claws_of_your_fierce_wargs,_skinned_the_hides_of_the_bear-people_to_wear_as_furs._The_great_halls_of_Gundabad_in_the_Misty_Mountains_are_now_yours_once_again,_as_they_were_in_the_time_of_Bolg_and_Azog.^^Many_of_you_have_perished_over_the_years,_somemany_of_them_slain_in_these_very_halls_and_tunnels_-_but_many_still_remain._Great_sport_you_have_had_with_the_greedy_little_diggers_and_their_friends,_in_the_past_-_and_greater_sport_you_will_have_now,_when_you_march_upon_them_and_take_everything_for_yourselves!^^Vengeance_for_Bolg,_for_Azog,_for_the_Great_Goblin_-_vengeance_for_the_goblins_of_Gundabad!
diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -136,7 +136,7 @@
 854
 1
 52
-28
+29
 3
 10
 4

diff --git a/menus.txt b/menus.txt
@@ -2,7 +2,7 @@ menusfile version 1
  240
 menu_start_game_1 18374686479671624192 ^^^^^^^^^^What_do_you_fight_for? none 10 2031 1 2 1107 1 0 4 0 75 1 42 727 2 1224979098644774912 42 2147483680 2 1224979098644774912 0 2133 2 144115188075855982 1 3 0 1 1 327 2133 2 144115188075855955 0 8
  mno_start_good  0  the_DAWN_of_a_new_Era  1 2060 1 12  .  mno_start_evil  0  the_TWILIGHT_of_Man  1 2060 1 13  .  mno_spacer  0  _  0  .  mno_faction_intros  0  Learn_about_the_different_factions_of_Middle-Earth  1 900 1 19  .  mno_spacer  0  _  0  .  mno_go_bback  0  Go_Back  1 2055 0  .  mno_quick  1 31 2 1 1  [dev:_quick_start_Gondor]  2 1 2 253 101 2060 1 1  .  mno_quick2  1 31 2 1 1  [dev:_quick_start_Mordor]  2 1 2 253 344 2060 1 1  . 
-menu_start_phase_2 512 ^^^^^______________Middle_Earth._A_shadow_is_growing_in_the_East,_^______________and_dark_things_come_forth_that_have_long_been_hidden._^______________The_free_peoples_prepare_for_war,_the_like_of_which_has_not_been_seen_for_an_age._^______________Men,_Elves,_Dwarves_and_Orcs;_all_will_play_their_part._^^______________What_part,_however,_remains_to_be_seen..._ none 29 2133 2 144115188075856556 0 4 0 31 2 144115188075855956 0 2133 2 144115188075855956 1 1107 1 0 1 1 6 1 1 1 1528 2 0 50 522 3 72057594037927956 144115188075855993 154 6 3 1224979098644774912 18 96 132 1 1224979098644774912 541 3 1224979098644774912 260 0 32 2 144115188075856342 0 2204 2 72057594037927951 1224979098644774912 31 2 72057594037927951 144115188075855993 541 3 1224979098644774912 67 144115188075856342 2133 2 72057594037927956 1224979098644774912 2133 2 1224979098644774912 96 3 0 1 4 181 0 72057594037927956 5 2133 2 144115188075855957 16 2133 2 144115188075855958 5 2133 2 144115188075855959 144115188075855993 2133 2 144115188075855960 0 2133 2 144115188075855961 -1 1 1 2 3 0 1 2 265 0 1 2 263 144115188075855993 7
+menu_start_phase_2 512 ^^^^^______________Middle_Earth._A_shadow_is_growing_in_the_East,_^______________and_dark_things_come_forth_that_have_long_been_hidden._^______________The_free_peoples_prepare_for_war,_the_like_of_which_has_not_been_seen_for_an_age._^______________Men,_Elves,_Dwarves_and_Orcs;_all_will_play_their_part._^^______________What_part,_however,_remains_to_be_seen..._ none 30 2031 1 0 2133 2 144115188075856556 0 4 0 31 2 144115188075855956 0 2133 2 144115188075855956 1 1107 1 0 1 1 6 1 1 1 1528 2 0 50 522 3 72057594037927956 144115188075855993 154 6 3 1224979098644774912 18 96 132 1 1224979098644774912 541 3 1224979098644774912 260 0 32 2 144115188075856342 0 2204 2 72057594037927951 1224979098644774912 31 2 72057594037927951 144115188075855993 541 3 1224979098644774912 67 144115188075856342 2133 2 72057594037927956 1224979098644774912 2133 2 1224979098644774912 96 3 0 1 4 181 0 72057594037927956 5 2133 2 144115188075855957 16 2133 2 144115188075855958 5 2133 2 144115188075855959 144115188075855993 2133 2 144115188075855960 0 2133 2 144115188075855961 -1 1 1 2 3 0 1 2 265 0 1 2 263 144115188075855993 7
  mno_go_forth  0  __________Go_forth_upon_your_chosen_path...  7 1 1 170 1672 2 0 72057594037927936 2133 2 144115188075855962 138 2133 2 144115188075856556 1 1533 1 0 1511 1 0 2060 1 169  .  mno_spacer  0  _  0  .  mno_change_tld_options  0  Change_TLD_options.  1 2060 1 51  .  mno_spacer  0  _  0  .  mno_cheat00  4 31 2 1 1 1561 3 1224979098644774912 144115188075856341 0 32 2 1224979098644774912 0 2322 2 21 1224979098644774912  CHEAT:_become_a_{s21}  3 1561 3 1224979098644774912 144115188075856341 0 1 2 253 1224979098644774912 2060 1 1  .  mno_cheat01  4 31 2 1 1 1561 3 1224979098644774912 144115188075856341 1 32 2 1224979098644774912 0 2322 2 21 1224979098644774912  CHEAT:_become_a__{s21}  3 1561 3 1224979098644774912 144115188075856341 1 1 2 253 1224979098644774912 2060 1 1  .  mno_cheat03  2 31 2 1 1 2323 2 21 144115188075856341  CHEAT:_add_10_{s21}_to_party  1 1610 3 0 144115188075856341 10  . 
 menu_start_game_3 512 ^^^^^^^^Choose_your_scenario: none 14 500 3 842 126 4280361505 500 3 842 127 4280361505 500 3 842 128 4281219856 500 3 842 129 4282539387 500 3 842 130 4281943560 2133 2 144115188075855963 40 2133 2 144115188075855964 315 2133 2 144115188075855965 10 2133 2 144115188075855966 107 2133 2 144115188075855957 16 2133 2 144115188075855958 5 2133 2 144115188075855959 3 2133 2 144115188075855960 0 2031 1 326 15
  mno_custom_battle_scenario_1  0  Skirmish,_Gondor_factions_vs_Harad  2 2133 2 144115188075855967 1 2060 1 5  .  mno_custom_battle_scenario_12  0  Choose_factions_for_battle  2 2133 2 144115188075855967 16 2060 1 190  .  mno_custom_battle_scenario_3  0  Skirmish,_Elves_vs_Black_Numenoreans  2 2133 2 144115188075855967 2 2060 1 5  .  mno_custom_battle_scenario_4  0  Helms_Deep_Defense,_Rohan_vs_Isengard  2 2133 2 144115188075855967 3 2060 1 5  .  mno_custom_battle_scenario_5  0  Skirmish,_North_factions_vs_Rhun  2 2133 2 144115188075855967 4 2060 1 5  .  mno_custom_battle_scenario_6  1 31 2 1 1  Siege_Attack,_Orcs_vs_Dwarves  2 2133 2 144115188075855967 5 2060 1 5  .  mno_custom_battle_scenario_7  0  Ambush,_Orcs_vs_Mirkwood  2 2133 2 144115188075855967 6 2060 1 5  .  mno_custom_battle_scenario_11  0  Test_Battles_(Tune_Balancing!)  1 2060 1 7  .  mno_custom_battle_scenario_10  0  Scenery_test_battle  2 2133 2 144115188075855967 9 2060 1 5  .  mno_troll_battle_scenario  0  Test_Troll_Battles  1 2060 1 10  .  mno_warg_battle_scenario  0  Test_Warg_Battles  1 2060 1 11  .  mno_choose_scene  0  **_Scene_Chooser_**  1 2060 1 208  .  mno_build_your_own_scene  0  **_Build_your_own_scene_for_TLD_**  1 2060 1 207  .  mno_dressing_room  1 31 2 1 1  Dressing_Room  2 2133 2 144115188075855967 99 2060 1 5  .  mno_go_back  0  Go_back  1 2055 0  .