* Fixes to the troll attacks + split troll roar / charge animation, s…

…o that knockback occurs at all times during any of the two animations
tldmod · Dec 13, 2018 · 13b3251 · 13b3251
1 parent 8e735ce
commit 13b3251
Show file tree

Hide file tree

Showing 13 changed files with 530 additions and 527 deletions.
diff --git a/ModuleSystem/module_animations_wb.py b/ModuleSystem/module_animations_wb.py
@@ -1911,18 +1911,18 @@
   #[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.6*(43-28)/72, "troll_slash_right", 34, 43, 6], # (last number X means: blend_in_X) 
+   [0.7*(43-28)/72, "troll_slash_right", 34, 43, 6], # (last number X means: blend_in_X) 
        #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.0, "troll_slash_right", 1, 28, 44],
+  [0.6, "troll_slash_right", 34, 43, 44],
  ],
  ["parried_thrust_musket", 0, amf_priority_parried|amf_use_weapon_speed|amf_play,
-   [attack_parried_duration_thrust, "anim_human", combat+6015, combat+6016, blend_in_parry], 
+   [attack_parried_duration, "parry_single_righttoleft", 0, 14, blend_in_parry], 
  ],
  ["blocked_thrust_musket", 0, amf_priority_blocked|amf_use_weapon_speed|amf_play,
-  [attack_blocked_duration_thrust, "anim_human", combat+6015, combat+6016, blend_in_parry], 
+  [attack_blocked_duration, "parry_single_righttoleft", 0, 14, blend_in_parry], 
  ],
  ["equip_pistol_melee", 0, amf_priority_equip|amf_play|amf_restart|amf_client_prediction,
    [0.3, "equip_pistol", 0, 10, arf_blend_in_0],
@@ -2175,10 +2175,10 @@
    [3.0, "anim_human", 80, 82, arf_use_stand_progress|arf_cyclic|arf_two_handed_blade, 0, (0, 0, 0), 0.5],
  ],
 
-  ["troll_roar", acf_enforce_all, amf_client_prediction|amf_priority_die|amf_play|amf_start_instantly|amf_continue_to_next,
+  ["troll_roar", acf_enforce_all, amf_client_prediction|amf_priority_die|amf_play|amf_start_instantly,
    [2.3, "man_cheer", 200, 289, arf_blend_in_1],
  ],
-  ["troll_charge", acf_enforce_all|acf_align_with_ground|acf_displace_position,  amf_priority_die|amf_play|amf_accurate_body,
+  ["troll_charge", acf_enforce_all|acf_align_with_ground|acf_displace_position,  amf_priority_die|amf_play|amf_start_instantly|amf_accurate_body,
    [2.6, "sprint", 0, 59, arf_blend_in_1, 0, (0, 9.4, 0), 0], 
  ],
 

diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -345,14 +345,14 @@ def heraldic(item_tableau):
 # ["free_troll_head_helm_b","Troll_Head",[("troll_head_b",0)],itp_no_pick_up_from_ground|itp_type_head_armor|itp_unique,0,1,weight(250)|head_armor(40)|difficulty(70),0],
 # ["free_troll_head_helm_c","Troll_Head",[("troll_head_c",0)],itp_no_pick_up_from_ground|itp_type_head_armor|itp_unique,0,1,weight(250)|head_armor(40)|difficulty(70),0],
 # #
-["tree_trunk_club_a","Tree_Trunk",[("troll_club",0),("tree_trunk_club",imodbit_poor),("0",imodbit_old)],itp_no_pick_up_from_ground|itp_type_two_handed_wpn|itp_primary|itp_wooden_parry|itp_wooden_attack|itp_crush_through|itp_can_penetrate_shield,itc_troll_attack|0,1,weight(250)|difficulty(0)|spd_rtng(60)|weapon_length(155)|swing_damage(48,cut)|thrust_damage(48,cut),0, []],
+["tree_trunk_club_a","Tree_Trunk",[("troll_club",0),("tree_trunk_club",imodbit_poor),("0",imodbit_old)],itp_no_pick_up_from_ground|itp_type_two_handed_wpn|itp_primary|itp_wooden_parry|itp_wooden_attack|itp_crush_through|itp_can_penetrate_shield,itc_troll_attack|0,1,weight(250)|difficulty(0)|spd_rtng(60)|weapon_length(155)|swing_damage(48,cut)|thrust_damage(24,cut),0, []],
 ["long_bearded_axe","Northmen_Bearded_Longaxe",[("long_bearded_axe",0)],itp_type_polearm|itp_shop|itp_primary|itp_two_handed|itp_bonus_against_shield|itp_wooden_parry|itp_cant_use_on_horseback,itc_nodachi|itcf_carry_axe_back,800,weight(7)|difficulty(10)|spd_rtng(84)|weapon_length(106)|swing_damage(45,cut)|thrust_damage(0,pierce),imodbits_weapon_good],
 ["2_handed_axe","Northmen_Longaxe",[("2_handed_axe",0)],itp_type_polearm|itp_shop|itp_primary|itp_two_handed|itp_bonus_against_shield|itp_wooden_parry|itp_cant_use_on_horseback,itc_nodachi|itcf_carry_axe_back,700,weight(8)|difficulty(10)|spd_rtng(82)|weapon_length(110)|swing_damage(47,cut)|thrust_damage(0,pierce),imodbits_weapon_good],
 
 # ["free_tree_trunk_club_b","Tree_Trunk",[("tree_trunk_club",0)],itp_no_pick_up_from_ground|itp_type_one_handed_wpn|itp_primary|itp_wooden_parry|itp_wooden_attack,itc_big_weapon|0,1,weight(250)|difficulty(0)|spd_rtng(92)|weapon_length(175)|swing_damage(48,cut)|thrust_damage(48,cut),0],
 # ["free_tree_trunk_invis","Tree_Trunk",[("0",0)],itp_no_pick_up_from_ground|itp_type_one_handed_wpn|itp_primary|itp_wooden_parry|itp_wooden_attack,itc_big_weapon|0,1,weight(250)|difficulty(0)|spd_rtng(92)|weapon_length(175)|swing_damage(48,cut)|thrust_damage(48,cut),0],
 ["free_giant_hammer","Giant_Hammer",[("giant_hammer",0)],itp_no_pick_up_from_ground|itp_type_one_handed_wpn|itp_primary|0,itc_big_weapon|0,1,weight(250)|difficulty(0)|spd_rtng(96)|weapon_length(150)|swing_damage(80,cut)|thrust_damage(65,cut),0],
-["giant_mace","Giant_Mace",[("giant_mace",0),("giant_hammer",imodbit_poor),("giant_mace_b",imodbit_old)],itp_no_pick_up_from_ground|itp_type_two_handed_wpn|itp_primary|itp_crush_through|itp_bonus_against_shield|itp_can_penetrate_shield,itc_troll_attack|0,1,weight(250)|difficulty(0)|spd_rtng(65)|weapon_length(130)|swing_damage(65,cut)|thrust_damage(48,cut),0,[]],
+["giant_mace","Giant_Mace",[("giant_mace",0),("giant_hammer",imodbit_poor),("giant_mace_b",imodbit_old)],itp_no_pick_up_from_ground|itp_type_two_handed_wpn|itp_primary|itp_crush_through|itp_bonus_against_shield|itp_can_penetrate_shield,itc_troll_attack|0,1,weight(250)|difficulty(0)|spd_rtng(65)|weapon_length(130)|swing_damage(65,cut)|thrust_damage(32,cut),0,[]],
 ["troll_shield_a","Troll_Shield",[("troll_shield_a",0)],itp_type_shield|itp_wooden_parry|itp_unique,itcf_carry_round_shield,100,weight(50)|hit_points(500)|body_armor(10)|spd_rtng(96)|weapon_length(115),imodbits_shield,],
 #
 ["free_olog_feet_boots","Olog_Hai_Feet",[("olog_feet",0)],itp_no_pick_up_from_ground|itp_type_foot_armor|itp_unique,0,1,weight(250)|head_armor(0)|body_armor(0)|leg_armor(62)|difficulty(70),0],

diff --git a/ModuleSystem/module_mission_templates_TLD.py b/ModuleSystem/module_mission_templates_TLD.py
@@ -2424,9 +2424,14 @@
 			(agent_set_animation_progress, ":nearby_agent_no", ":random_timings"), # differentiate timings a bit
 		(try_end),
 		(agent_play_sound, ":troll", "snd_troll_grunt_long"),
-	 	(agent_set_animation, ":troll", "anim_troll_roar", 0),
-	 	(agent_set_animation, ":troll", "anim_troll_roar", 1),
-	 	(display_message, "@Troll is Charging!"), 
+		(store_random_in_range, ":rand_charge", 0, 100),
+		(try_begin),
+			(lt, ":rand_charge", 50),
+	 		(agent_set_animation, ":troll", "anim_troll_roar", 0),
+	 	(else_try),
+	 		(agent_set_animation, ":troll", "anim_troll_charge", 0),
+	 	(try_end),
+	 	#(display_message, "@Troll is Charging!"), 
 	(try_end),
 
 ]),
@@ -2454,12 +2459,12 @@
 		(agent_set_speed_modifier, ":troll", 50),
 		(assign, reg65, ":time"),
 		(assign, reg66, ":time_last_charge"),
-		(display_message, "@Charge turned off -- Time: {reg65}, Last Charge: {reg66}"),
+		#(display_message, "@Charge turned off -- Time: {reg65}, Last Charge: {reg66}"),
 	(try_end), 
 
 ]),
 
-(0.2,0,0.5, [(gt, "$trolls_in_battle", 0)],[
+(0.2,0.5,2, [(gt, "$trolls_in_battle", 0)],[
 
 	(try_for_agents, ":troll"),
 		(agent_is_active, ":troll"),

diff --git a/_wb/actions.txt b/_wb/actions.txt
@@ -990,13 +990,13 @@
  ready_thrust_musket 66560 572522497  1
   0.35 troll_slash_right 1 28 44 0 0 0 0 0.0 
  release_thrust_musket 66560 572522506  1
-  0.125 troll_slash_right 34 43 6 0 0 0 0 0.0 
+  0.145833333333 troll_slash_right 34 43 6 0 0 0 0 0.0 
  release_thrust_musket_continue 0 572522497  1
-  0 troll_slash_right 1 28 44 0 0 0 0 0.0 
+  0.6 troll_slash_right 34 43 44 0 0 0 0 0.0 
  parried_thrust_musket 0 35651599  1
-  0.7 anim_human 26015 26016 6 0 0 0 0 0.0 
+  0.6 parry_single_righttoleft 0 14 6 0 0 0 0 0.0 
  blocked_thrust_musket 0 35651599  1
-  0.6 anim_human 26015 26016 6 0 0 0 0 0.0 
+  0.3 parry_single_righttoleft 0 14 6 0 0 0 0 0.0 
  equip_pistol_melee 0 184549446  1
   0.3 equip_pistol 0 10 1 0 0 0 0 0.0 
  unequip_pistol_melee 0 184549446  1
@@ -1156,9 +1156,9 @@
   3 anim_human 60 62 1342177280 0 0 0 0  0.75 
   3 anim_human 70 72 1342177280 0 0 0 0  0.25 
   3 anim_human 80 82 1358954496 0 0 0 0  0.5 
- troll_roar 1024 2197880927  1
+ troll_roar 1024 50397279  1
   2.3 man_cheer 200 289 2 0 0 0 0 0.0 
- troll_charge 17410 41943135  1
+ troll_charge 17410 42008671  1
   2.6 sprint 0 59 2 0 0 9.4 0  0 
  unused_human_anim_97 0 0  1
   1 anim_human 0 1 0 0 0 0 0 0.0