Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* Fix Troll Aim by limiting their types of attack, along with the cre…
…ation of a new item capability for Trolls + Make sure faction rank campaign rewards only show up for active factions
  • Loading branch information
khamukkamu committed Dec 13, 2018
1 parent c2c1937 commit 8e735ce
Show file tree
Hide file tree
Showing 28 changed files with 1,964 additions and 2,007 deletions.
1 change: 1 addition & 0 deletions ModuleSystem/Header/header_items.py
Expand Up @@ -411,6 +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_overhead_only = itcf_force_64_bits|itcf_overswing_onehanded | itcf_overswing_twohanded

#EXtra Mesh IDs
Expand Down
2 changes: 1 addition & 1 deletion ModuleSystem/ID/ID_items.py
Expand Up @@ -74,7 +74,7 @@
itm_tree_trunk_club_a = 73
itm_long_bearded_axe = 74
itm_2_handed_axe = 75
itm_overhead_only_giant_mace = 76
itm_free_giant_hammer = 76
itm_giant_mace = 77
itm_troll_shield_a = 78
itm_free_olog_feet_boots = 79
Expand Down
18 changes: 11 additions & 7 deletions ModuleSystem/module_animations_wb.py
Expand Up @@ -1905,20 +1905,24 @@
["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_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],
["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)
#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_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", 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)
#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.2, "musket_thrust_forward", 50, 54, arf_blend_in_2],
[0.0, "troll_slash_right", 1, 28, 44],
],
["parried_thrust_musket", 0, amf_priority_parried|amf_use_weapon_speed|amf_play,
[attack_parried_duration, "musket_thrust_forward_parry", 1, 9, arf_blend_in_2],
[attack_parried_duration_thrust, "anim_human", combat+6015, combat+6016, blend_in_parry],
],
["blocked_thrust_musket", 0, amf_priority_blocked|amf_use_weapon_speed|amf_play,
[attack_blocked_duration, "musket_thrust_forward_parry", 1, 9, arf_blend_in_2],
[attack_blocked_duration_thrust, "anim_human", combat+6015, combat+6016, 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],
Expand Down
7 changes: 3 additions & 4 deletions ModuleSystem/module_items.py
Expand Up @@ -345,15 +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_nodachi|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(48,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],
["overhead_only_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_overhead_only|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_bastardfalchion|0,1,weight(250)|difficulty(0)|spd_rtng(65)|weapon_length(130)|swing_damage(65,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,[]],
["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],
Expand Down
4 changes: 2 additions & 2 deletions ModuleSystem/module_mission_templates.py
Expand Up @@ -996,8 +996,8 @@
### WB only triggers
tld_archer_aim_fix,
tld_archer_aim_fix_on_release,
tld_troll_aim_fix,
tld_troll_aim_fix_on_release,
#tld_troll_aim_fix,
#tld_troll_aim_fix_on_release,
tld_move_ai,
tld_ai_kicking,
tld_ai_is_kicked,
Expand Down
46 changes: 23 additions & 23 deletions ModuleSystem/module_presentations.py
Expand Up @@ -3323,19 +3323,19 @@
(position_set_y, pos1, 100),
(overlay_set_position, "$g_presentation_obj_2", pos1),

]+concatenate_scripts([[
(try_begin),
(eq, cheat_switch, 1),
(create_button_overlay, "$g_presentation_obj_3", "@Dev Quick Start: Gondor", tf_center_justify),
(position_set_x, pos1, 280),
(position_set_y, pos1, 140),
(overlay_set_position, "$g_presentation_obj_3", pos1),
(create_button_overlay, "$g_presentation_obj_4", "@Dev Quick Start: Mordor", tf_center_justify),
(position_set_x, pos1, 680),
(position_set_y, pos1, 140),
(overlay_set_position, "$g_presentation_obj_4", pos1),
(try_end),
] for ct in range(cheat_switch)])+[
#]+concatenate_scripts([[
#(try_begin),
# (eq, cheat_switch, 1),
# (create_button_overlay, "$g_presentation_obj_3", "@Dev Quick Start: Gondor", tf_center_justify),
# (position_set_x, pos1, 280),
# (position_set_y, pos1, 140),
# (overlay_set_position, "$g_presentation_obj_3", pos1),
# (create_button_overlay, "$g_presentation_obj_4", "@Dev Quick Start: Mordor", tf_center_justify),
# (position_set_x, pos1, 680),
# (position_set_y, pos1, 140),
# (overlay_set_position, "$g_presentation_obj_4", pos1),
#(try_end),
#] for ct in range(cheat_switch)])+[

#FACTION SIDE GOOD
#text
Expand Down Expand Up @@ -3387,16 +3387,16 @@
(eq, ":object", "$g_presentation_obj_2"),
#(presentation_set_duration, 0),
(start_presentation, "prsnt_faction_intro_text"),
(else_try),
(eq, ":object", "$g_presentation_obj_3"),
(call_script,"script_start_as_one","trp_gondor_commoner"),
(jump_to_menu,"mnu_start_phase_2"),
(presentation_set_duration, 0),
(else_try),
(eq, ":object", "$g_presentation_obj_4"),
(call_script,"script_start_as_one","trp_uruk_snaga_of_mordor"),
(jump_to_menu,"mnu_start_phase_2"),
(presentation_set_duration, 0),
#(else_try),
# (eq, ":object", "$g_presentation_obj_3"),
# (call_script,"script_start_as_one","trp_gondor_commoner"),
# (jump_to_menu,"mnu_start_phase_2"),
# (presentation_set_duration, 0),
#(else_try),
# (eq, ":object", "$g_presentation_obj_4"),
# (call_script,"script_start_as_one","trp_uruk_snaga_of_mordor"),
# (jump_to_menu,"mnu_start_phase_2"),
# (presentation_set_duration, 0),
(else_try),
(eq, ":object", "$g_option_good"),
(start_presentation, "prsnt_faction_selection_good"),
Expand Down
1 change: 1 addition & 0 deletions ModuleSystem/module_simple_triggers.py
Expand Up @@ -3223,6 +3223,7 @@

(12,[
(try_for_range, ":faction_wc", kingdoms_begin, kingdoms_end),
(faction_slot_eq, ":faction_wc", slot_faction_state, sfs_active), #Needs to be alive
(call_script, "script_get_faction_rank", ":faction_wc"),
(assign, ":rank", reg0), #rank points to rank number 0-9
(try_begin),
Expand Down
14 changes: 7 additions & 7 deletions _wb/actions.txt
Expand Up @@ -987,16 +987,16 @@
0.3 1h_spear_thrust_overhead 26 22 6 0 0 0 0 0.0
blocked_overswing_musket 0 35651599 1
0.3 1h_spear_thrust_overhead 26 22 6 0 0 0 0 0.0
ready_thrust_musket 524288 1679818762 1
0.35 musket_thrust_forward 1 19 7 0 0 0 0 0.0
release_thrust_musket 524288 2183135242 1
0.9 musket_thrust_forward 19 50 6 0 0 0 0 0.0
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
release_thrust_musket_continue 0 572522497 1
0.2 musket_thrust_forward 50 54 3 0 0 0 0 0.0
0 troll_slash_right 1 28 44 0 0 0 0 0.0
parried_thrust_musket 0 35651599 1
0.6 musket_thrust_forward_parry 1 9 3 0 0 0 0 0.0
0.7 anim_human 26015 26016 6 0 0 0 0 0.0
blocked_thrust_musket 0 35651599 1
0.3 musket_thrust_forward_parry 1 9 3 0 0 0 0 0.0
0.6 anim_human 26015 26016 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
Expand Down

0 comments on commit 8e735ce

Please sign in to comment.