* New Troll Attack animation thanks to Merlkir + Unwield Shield durin…

…g Troll Charge + Add new custom scenario (hidden for now)
tldmod · Dec 17, 2018 · 9c5cfe5 · 9c5cfe5
1 parent d8e0e1e
commit 9c5cfe5
Show file tree

Hide file tree

Showing 38 changed files with 1,767 additions and 1,010 deletions.
diff --git a/ModuleSystem/Header/header_items.py b/ModuleSystem/Header/header_items.py
@@ -411,7 +411,7 @@ def accuracy(x):
 itc_pike_upstab = itc_parry_polearm|itcf_force_64_bits|itcf_overswing_spear|itcf_thrust_polearm
 #Hoboistice end
 
-itc_troll_attack = itcf_force_64_bits|itcf_thrust_musket |itc_parry_two_handed | itc_parry_onehanded | itcf_overswing_twohanded | itcf_overswing_onehanded
+itc_troll_attack = itcf_force_64_bits| itcf_thrust_musket | itcf_overswing_twohanded | itcf_overswing_onehanded
 itc_overhead_only = itcf_force_64_bits|itcf_overswing_onehanded | itcf_overswing_twohanded
 
 #EXtra Mesh IDs

diff --git a/ModuleSystem/ID/ID_mission_templates.py b/ModuleSystem/ID/ID_mission_templates.py
@@ -63,9 +63,10 @@
 mst_tutorial_5 = 62
 mst_alternate_training = 63
 mst_ori_last_stand = 64
-mst_intro_rohan = 65
-mst_intro_gondor = 66
-mst_intro_mordor = 67
-mst_intro_joke = 68
-mst_test_gandalf = 69
-mst_conversation_cutscene = 70
+mst_darkness_attack = 65
+mst_intro_rohan = 66
+mst_intro_gondor = 67
+mst_intro_mordor = 68
+mst_intro_joke = 69
+mst_test_gandalf = 70
+mst_conversation_cutscene = 71
diff --git a/ModuleSystem/ID/ID_scenes.py b/ModuleSystem/ID/ID_scenes.py
@@ -411,3 +411,4 @@
 scn_advcamp_gundabad_siege = 410
 scn_advcamp_rhun_siege = 411
 scn_erebor_castle_2 = 412
+scn_random_scene_plain_forest_custom_5 = 413
diff --git a/ModuleSystem/ID/ID_scripts_wb.py b/ModuleSystem/ID/ID_scripts_wb.py
@@ -723,5 +723,7 @@
 script_guldur_fog_effect = 722
 script_agent_reassign_team = 723
 script_tld_internal_set_good_or_evil_ui = 724
+script_flash_and_animate = 725
+script_get_position_and_teleport_behind_agent = 726
 
 
diff --git a/ModuleSystem/module_animations_wb.py b/ModuleSystem/module_animations_wb.py
@@ -1905,18 +1905,20 @@
  ["blocked_overswing_musket", 0, amf_priority_blocked|amf_use_weapon_speed|amf_play,
    [0.3, "1h_spear_thrust_overhead", 26, 22, blend_in_parry],#95 79
  ],
- ["ready_thrust_musket",  acf_thrust|acf_enforce_all, amf_priority_continue|amf_use_weapon_speed|amf_play|amf_client_owner_prediction,
-   [ready_durn, "troll_slash_right", 1, 28, 44], # (last 44 means: blend_in_44)
+ ["ready_thrust_musket", acf_right_cut|acf_rot_vertical_sword|acf_anim_length(100), amf_priority_attack|amf_use_weapon_speed|amf_use_inertia|amf_keep|amf_client_owner_prediction,
+   [ready_durn, "attacks_single_righttoleft_low", 2, 5, blend_in_ready], 
    #acf_overswing, amf_priority_attack|amf_use_weapon_speed|amf_use_inertia|amf_keep|amf_client_owner_prediction,
   #[ready_durn, "musket_thrust_forward", 1, 19, blend_in_ready],
  ],
- ["release_thrust_musket", acf_thrust|acf_enforce_all, amf_priority_attack|amf_use_weapon_speed|amf_play|amf_client_owner_prediction,
-   [0.7*(43-28)/72, "troll_slash_right", 34, 43, 6], # (last number X means: blend_in_X) 
+ ["release_thrust_musket", acf_right_cut|acf_rot_vertical_sword|acf_anim_length(100), amf_priority_attack|amf_use_weapon_speed|amf_play|amf_continue_to_next,
+##   [0.61, "anim_human", combat+8510, combat+8540, blend_in_release],
+[0.6, "attacks_single_righttoleft_low", 5, 28, blend_in_release], 
+[0.6, "swing_1h_underswing", 0, 24, blend_in_release],
        #acf_overswing, amf_priority_attack|amf_use_weapon_speed|amf_play|amf_continue_to_next,
   #[0.9, "musket_thrust_forward", 19, 50, blend_in_release],
  ],
- ["release_thrust_musket_continue", 0, amf_priority_continue|amf_use_weapon_speed|amf_play|amf_client_owner_prediction,
-  [0.6, "troll_slash_right", 34, 43, 44],
+ ["release_thrust_musket_continue",  0, amf_priority_continue|amf_use_weapon_speed|amf_play|amf_client_owner_prediction,
+  [0.4, "attacks_single_righttoleft_low", 28, 44, blend_in_continue], 
  ],
  ["parried_thrust_musket", 0, amf_priority_parried|amf_use_weapon_speed|amf_play,
    [attack_parried_duration, "parry_single_righttoleft", 0, 14, blend_in_parry], 

diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -166,10 +166,12 @@
 slot_agent_is_in_scripted_mode    = 4
 slot_agent_is_not_reinforcement   = 5
 slot_agent_tournament_point       = 6
+slot_agent_knocked_down			  = slot_agent_tournament_point # Use for tracking Knockbacks - Kham
 slot_agent_arena_team_set         = 7
 slot_agent_map_overlay_id         = 10
 slot_agent_target_entry_point     = 11
-slot_agent_walker_type            = 12    
+slot_agent_walker_type            = 12
+slot_agent_last_knockdown_time    = slot_agent_walker_type #Use for tracking Knockbacks    
 
 # TLD
 

diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
@@ -262,6 +262,8 @@
 #		[(assign, "$g_custom_battle_scenario", 1),(jump_to_menu, "mnu_custom_battle_2"),]),
 
 	]+concatenate_scripts([[
+	("custom_battle_scenario_88",[],"Chasing an Orc Scout Party",
+		[(assign, "$g_custom_battle_scenario", 88),(jump_to_menu, "mnu_custom_battle_2"),]),
 	("custom_battle_scenario_11",[],"Test Battles (Tune Balancing!)",
 		[(jump_to_menu, "mnu_quick_battle_general_test"),]),
 	("custom_battle_scenario_10",[],"Scenery test battle",
@@ -856,6 +858,25 @@
 
 		(str_store_string, s16, "@Four years after bringing a group of Dwarves from Erebor to attempt to resettle the once Dwarf-city of Khazad-dûm, Balin was killed by an Orc arrow while peering into Lake Mirrormere, and his people became immediately engaged with many Orcs coming of up the Silverlode River. After a continuous retreat from the East-gate and First Hall, then the Bridge of Khazad-dûm and Second Hall, the remaining Longbeards were forced all the way back into the Twenty-first Hall. [2] After an unsuccessful attempt to escape through the Doors of Durin that saw the death of Óin, the Chamber of Mazarbul became the last hold-out of the Colony after losing the Twenty-first Hall just outside chamber. Barring the gates, Ori and the few survivors set up a final defense."),
 		(set_background_mesh, "mesh_town_erebor"),
+	 (else_try),
+     ########################################## Darkness Attack
+       	(eq, "$g_custom_battle_scenario", 88),
+       	(assign, "$g_custom_battle_scene", "scn_random_scene_plain_forest_custom_5"),
+       	(troop_set_slot, "trp_dorwinion_spirit_leader", slot_troop_hp_shield, 200),
+       	(assign, "$g_player_troop", "trp_knight_1_7"),
+    	(set_player_troop, "$g_player_troop"),
+	    (modify_visitors_at_site, "$g_custom_battle_scene"),
+
+       	(set_visitor, 0, "$g_player_troop"),
+		(set_visitors, 4, "trp_orc_snaga_of_mordor", 2),
+		(set_visitors, 5, "trp_orc_snaga_of_mordor", 2),
+		(set_visitors, 6, "trp_orc_snaga_of_mordor", 2),
+
+
+## ENEMY
+
+		(str_store_string, s16, "@You chase an orc scout party into the forest..."),
+		(set_background_mesh, "mesh_draw_orc_raiders"),
      (else_try),
 ########################################## GONDOR VS CORSAIRS  
        (eq, "$g_custom_battle_scenario", 7),
@@ -978,6 +999,7 @@
        (eq, "$g_custom_battle_scenario", 12),
        (assign, "$g_custom_battle_scene", "scn_minas_tirith_center"),
        (troop_set_slot, "trp_troll_of_moria", slot_troop_hp_shield, 200),
+       (troop_set_slot, "trp_olog_hai", slot_troop_hp_shield, 200),
        (assign, "$g_player_troop", "trp_eorl_guard_of_rohan"),
        (set_player_troop, "$g_player_troop"),
        (modify_visitors_at_site, "$g_custom_battle_scene"),
@@ -990,6 +1012,7 @@
        (eq, "$g_custom_battle_scenario", 13),
        (assign, "$g_custom_battle_scene", "scn_minas_tirith_center"),
        (troop_set_slot, "trp_troll_of_moria", slot_troop_hp_shield, 200),
+       (troop_set_slot, "trp_olog_hai", slot_troop_hp_shield, 200),
        (assign, "$g_player_troop", "trp_elite_lancer_of_rohan"),
        (set_player_troop, "$g_player_troop"),
        (modify_visitors_at_site, "$g_custom_battle_scene"),
@@ -1222,6 +1245,7 @@
          (else_try),(eq, "$g_custom_battle_scenario", 3),(set_jump_mission,"mt_custom_battle_HD"),#(rest_for_hours,8,1000,0),
 		 ] + (is_a_wb_menu==1 and [
 		 (else_try),(eq, "$g_custom_battle_scenario", 8),(set_jump_mission,"mt_ori_last_stand"),
+		 (else_try),(eq, "$g_custom_battle_scenario", 88),(set_jump_mission,"mt_darkness_attack"),(rest_for_hours,3,1000,0),(stop_all_sounds, 1),
 		 ] or []) + [
          (else_try),(eq, "$g_custom_battle_scenario", 9),(set_jump_mission,"mt_custom_battle_dynamic_scene"),
          (else_try),(eq, "$g_custom_battle_scenario",16),(set_jump_mission,"mt_custom_battle_parade"),#(rest_for_hours,12,1000,0),

diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -1423,7 +1423,7 @@ def heraldic(item_tableau):
 ["free_galadriel","Galadriel_suit",[("galadriel",0)],itp_type_body_armor|itp_covers_legs|itp_unique|itp_civilian,0,1,weight(225)|head_armor(60)|body_armor(80)|leg_armor(60)|difficulty(0),0,],
 ["empty_hands","empty_hands",[("0",0)],itp_type_hand_armor|itp_unique|itp_no_pick_up_from_ground,0,130,weight(225)|body_armor(1)|difficulty(0),0],
 ["empty_legs","empty_legs",[("0",0)],itp_type_foot_armor|itp_unique|itp_no_pick_up_from_ground,0,130,weight(225)|leg_armor(1)|difficulty(0),0],
-["empty_head","empty head",[("0",0),("chieftainhelm",imodbit_old)],itp_type_head_armor|itp_unique|itp_covers_beard|itp_covers_head|itp_no_pick_up_from_ground,0,1,weight(250)|head_armor(50)|difficulty(0),0],
+["empty_head","empty head",[("0",0),("chieftainhelm",imodbit_old), ("pointedhelmet", imodbit_poor)],itp_type_head_armor|itp_unique|itp_covers_beard|itp_covers_head|itp_no_pick_up_from_ground,0,1,weight(250)|head_armor(50)|difficulty(0),0],
 #### TLD REWARD ITEMS BEGIN
 # magic items begin
 ["ent_water","Strange_bowl_of_water",[("ent_water",0)],itp_unique|itp_type_goods,0,200,weight(2)|abundance(0)|0,imodbits_none],