* forgot to uncomment the troll attacks .sorry

tldmod · Oct 4, 2018 · 714c2fa · 714c2fa
1 parent 696aed9
commit 714c2fa
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 74 deletions.
diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
@@ -921,6 +921,7 @@
        (eq, "$g_custom_battle_scenario", 17),
        (assign, "$g_custom_battle_scene", "scn_minas_tirith_center"),
        (assign, "$g_player_troop", "trp_gondor_veteran_swordsmen"),
+       (troop_set_slot, "trp_olog_hai", slot_troop_hp_shield, 150),
        (set_player_troop, "$g_player_troop"),
        (modify_visitors_at_site, "$g_custom_battle_scene"),
        (set_visitor, 0, "$g_player_troop"),
@@ -980,6 +981,7 @@
        (eq, "$g_custom_battle_scenario", 15),
        (assign, "$g_custom_battle_scene", "scn_minas_tirith_center"),
        (assign, "$g_player_troop", "trp_olog_hai"),
+       (troop_set_slot, "trp_olog_hai", slot_troop_hp_shield, 150),
        (set_player_troop, "$g_player_troop"),
        (modify_visitors_at_site, "$g_custom_battle_scene"),
        (set_visitor, 16, "$g_player_troop"),

diff --git a/ModuleSystem/module_mission_templates.py b/ModuleSystem/module_mission_templates.py
@@ -953,7 +953,7 @@
 	#tld_wargs_attack_horses, # WIP (CppCoder)
 	tld_slow_wounded,
  	custom_tld_spawn_troop, custom_tld_init_battle,
-	custom_tld_horses_hate_trolls, #custom_troll_hitting,
+	custom_tld_horses_hate_trolls, custom_troll_hitting,
 	tld_cheer_on_space_when_battle_over_press, tld_cheer_on_space_when_battle_over_release,
 	nazgul_sweeps,
 	custom_warg_sounds, custom_lone_wargs_are_aggressive, #custom_lone_wargs_special_attack, # WIP, needs more work (mtarini); Improved, but still WIP. (CppCoder)
@@ -967,7 +967,7 @@
   reset_fog,
   horse_whistle_init,
   horse_whistle,
-] + tld_morale_triggers + fade + khams_custom_player_camera + tld_fallen_riders_get_damaged + bright_nights + tld_spawn_battle_animals + tld_warg_leap_attack
+] + tld_morale_triggers + fade  + khams_custom_player_camera + tld_fallen_riders_get_damaged + bright_nights + tld_spawn_battle_animals + tld_warg_leap_attack
 
 
 tld_siege_battle_scripts = [
@@ -5372,7 +5372,7 @@
 	common_custom_battle_tab_press,
 	common_custom_battle_question_answered,
 	common_inventory_not_available,
-	(0, 0, ti_once, [],[ (assign, "$g_battle_result", 0),(call_script, "script_combat_music_set_situation_with_culture")]),
+	(0, 0, ti_once, [],[ (assign, "$g_battle_result", 0),(call_script, "script_combat_music_set_situation_with_culture"), ]),
 	common_music_situation_update,
 	custom_battle_check_victory_condition,
 	common_battle_victory_display,

diff --git a/ModuleSystem/module_mission_templates_TLD.py b/ModuleSystem/module_mission_templates_TLD.py
@@ -2160,6 +2160,7 @@
 	(eq, ":type", tf_troll),
 
 	(agent_set_speed_modifier, ":troll", 30),
+	(agent_set_max_hit_points, ":troll", 25),
  ]),
 
 (ti_on_agent_hit, 0, 7, [

diff --git a/ModuleSystem/module_mission_templates_TLD_wb.py b/ModuleSystem/module_mission_templates_TLD_wb.py
@@ -1759,7 +1759,18 @@
     (store_trigger_param_2, ":dealer"),
     (store_trigger_param_3, ":damage"),
 
+    (get_player_agent_no, ":player"),
+    (agent_get_troop_id, ":troop_id", ":agent"),
+
     (agent_get_slot, ":current_hp_shield", ":agent", slot_agent_hp_shield),
+
+    (try_begin),
+      (eq, ":troop_id", "trp_olog_hai"),
+      (gt, ":current_hp_shield", 0),
+      (lt, ":damage", 4),
+      (assign, ":damage", 0),
+    (try_end),
+
     (try_begin),
       (gt, ":current_hp_shield", 0),
       (val_sub, ":current_hp_shield", ":damage"),
@@ -1773,8 +1784,7 @@
       #(assign, reg3, ":current_hp_shield"),
       #(display_message, "@Hp shield: {reg3} left."), 
 
-    (get_player_agent_no, ":player"),
-    (agent_get_troop_id, ":troop_id", ":agent"),
+
 
     (try_begin),
       (eq, ":dealer", ":player"),

diff --git a/_wb/menus.txt b/_wb/menus.txt
diff --git a/_wb/mission_templates.txt b/_wb/mission_templates.txt
diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -241,7 +241,7 @@
 2
 2
 46
-26
+48
 28
 190
 71

diff --git a/menus.txt b/menus.txt
diff --git a/mission_templates.txt b/mission_templates.txt
diff --git a/variable_uses.txt b/variable_uses.txt
@@ -241,7 +241,7 @@
 2
 2
 30
-25
+46
 27
 183
 47