Skip to content

Commit

Permalink
*Quality of Life modifications
Browse files Browse the repository at this point in the history 
- Improve Thrust Speed (inspired by VC)
-- This makes thrust slightly faster, and actually more useful.
- Add restrictions to Orc Mutiny
-- If player level is > 13 or player rank > 3, or leadership > 5 they don't mutiny anymore
-- If player level  is = 13 or player rank = 3 or leadership = 5, mutinies should occur less often
- Increase amount of parties
-- As Swyter has already found the reason for the dreaded save corruption bug a few years ago, I think it is safe to bump up the number of parties. This will make it a more dynamic game.
- Use quickstrings for the Destroy scout camp quest instead of repeating the same thing.
  • Loading branch information
@khamukkamu
khamukkamu committed Feb 15, 2017
1 parent f48cd67 commit 845e97b
Show file tree
Hide file tree
Showing 20 changed files with 290 additions and 260 deletions.
8 changes: 4 additions & 4 deletions ModuleSystem/module_animations.py
View file
Expand Up @@ -628,7 +628,7 @@
[ready_durn, "anim_human", combat+6000, combat+6010, blend_in_ready],
],
["release_thrust_twohanded", acf_thrust|acf_parallels_for_look_slope|acf_anim_length(100),
[0.61, "anim_human", combat+6010, combat+6040, blend_in_release],
[0.46, "anim_human", combat+6010, combat+6040, blend_in_release],
],
["parry_thrust_twohanded", 0,
[attack_parry_duration, "anim_human", combat+6015, combat+6016, blend_in_parry],
Expand All @@ -646,7 +646,7 @@
[ready_durn, "anim_human", combat+8500, combat+8510, blend_in_ready],
],
["release_thrust_onehanded", acf_thrust|acf_parallels_for_look_slope|acf_anim_length(100)|acf_rotate_body|acf_enforce_rightside,
[0.61, "anim_human", combat+8510, combat+8540, blend_in_release],
[0.46, "anim_human", combat+8510, combat+8540, blend_in_release],
],
["parry_thrust_onehanded", acf_rotate_body|acf_enforce_rightside,
[attack_parry_duration, "anim_human", combat+8515, combat+8513, blend_in_parry],
Expand All @@ -655,7 +655,7 @@
[ready_durn, "anim_human", combat+9500, combat+9510, blend_in_ready],
],
["release_thrust_onehanded_lance", acf_thrust|acf_parallels_for_look_slope|acf_anim_length(100)|acf_rotate_body|acf_enforce_rightside,
[0.61, "anim_human", combat+9510, combat+9540, blend_in_release],
[0.46, "anim_human", combat+9510, combat+9540, blend_in_release],
],
["parry_thrust_onehanded_lance", acf_rotate_body|acf_enforce_rightside,
[attack_parry_duration, "anim_human", combat+9515, combat+9513, blend_in_parry],
Expand Down Expand Up @@ -721,7 +721,7 @@
# [ready_durn, "thrust_staff", 70, 93, blend_in_ready],
],
["release_thrust_staff", acf_thrust|acf_parallels_for_look_slope|acf_anim_length(100),
[0.6, "anim_human", combat+7310, combat+7340, arf_blend_in_2],
[0.45, "anim_human", combat+7310, combat+7340, arf_blend_in_2],
# [0.6, "thrust_staff", 93, 125, arf_blend_in_2],
],
["parry_thrust_staff", acf_parallels_for_look_slope|acf_anim_length(100),
Expand Down
10 changes: 5 additions & 5 deletions ModuleSystem/module_animations_wb.py
View file
Expand Up @@ -903,7 +903,7 @@
[ready_durn, "anim_human", combat+6000, combat+6010, blend_in_ready],
],
["release_thrust_twohanded", acf_thrust|acf_rot_vertical_bow|acf_anim_length(100), amf_priority_attack|amf_use_weapon_speed|amf_play|amf_continue_to_next,
[0.61, "anim_human", combat+6010, combat+6031, blend_in_release],
[0.46, "anim_human", combat+6010, combat+6031, blend_in_release],
],
["release_thrust_twohanded_continue", 0, amf_priority_continue|amf_use_weapon_speed|amf_play|amf_client_owner_prediction,
[0.1, "anim_human", combat+6031, combat+6040, blend_in_continue],
Expand Down Expand Up @@ -938,7 +938,7 @@
],
["release_thrust_onehanded", acf_thrust|acf_rot_vertical_sword|acf_anim_length(100)|acf_enforce_rightside, amf_priority_attack|amf_use_weapon_speed|amf_play|amf_rider_rot_thrust|amf_continue_to_next,
## [0.61, "anim_human", combat+8510, combat+8540, blend_in_release],
[0.62, "attacks_thrust_onehanded", 12, 32, blend_in_release],
[0.47, "attacks_thrust_onehanded", 12, 32, blend_in_release],
],
["release_thrust_onehanded_continue", 0, amf_priority_continue|amf_use_weapon_speed|amf_play|amf_rider_rot_thrust|amf_client_owner_prediction,
[0.3, "attacks_thrust_onehanded", 32, 54, blend_in_continue],
Expand All @@ -957,7 +957,7 @@
["release_thrust_onehanded_horseback", acf_thrust|acf_rot_vertical_sword|acf_anim_length(100)|acf_enforce_rightside, amf_priority_attack|amf_use_weapon_speed|amf_play|amf_rider_rot_thrust|amf_continue_to_next,
## [0.61, "anim_human", combat+8510, combat+8540, blend_in_release],
## [0.9, "attacks_thrust_onehanded", 16, 54, blend_in_release],
[0.62, "attacks_thrust_onehanded", 12, 32, blend_in_release],
[0.47, "attacks_thrust_onehanded", 12, 32, blend_in_release],
],
["release_thrust_onehanded_horseback_continue", 0, amf_priority_continue|amf_use_weapon_speed|amf_play|amf_rider_rot_thrust|amf_client_owner_prediction,
## [0.1, "attacks_thrust_onehanded", 54, 54, blend_in_continue],
Expand All @@ -976,7 +976,7 @@
],
["release_thrust_onehanded_lance", acf_thrust|acf_rot_vertical_sword|acf_anim_length(100)|acf_enforce_rightside, amf_priority_attack|amf_use_weapon_speed|amf_play|amf_rider_rot_thrust|amf_continue_to_next,
## [0.62, "anim_human", combat+9507, combat+9530, blend_in_release],
[0.62, "thrust_onehanded_lance_hb", 8, 33, blend_in_release],
[0.47, "thrust_onehanded_lance_hb", 8, 33, blend_in_release],
],
["release_thrust_onehanded_lance_continue", 0, amf_priority_continue|amf_use_weapon_speed|amf_play|amf_rider_rot_thrust|amf_client_owner_prediction,
## [0.1, "anim_human", combat+9530, combat+9540, blend_in_continue],
Expand Down Expand Up @@ -1171,7 +1171,7 @@
# [0.62, "anim_human", combat+7310, combat+7335, blend_in_release],
## [0.62, "anim_human", combat+7307, combat+7333, blend_in_release],
# [0.6, "thrust_staff", 93, 125, arf_blend_in_2],
[0.6, "attacks_staff_thrust", 21, 40, blend_in_release],
[0.45, "attacks_staff_thrust", 21, 40, blend_in_release],
],
["release_thrust_staff_continue", acf_thrust|acf_rot_vertical_bow|acf_anim_length(100), amf_priority_attack|amf_use_weapon_speed|amf_play|amf_client_owner_prediction,
## [0.6, "anim_human", combat+7334, combat+7340, blend_in_release],
Expand Down
8 changes: 4 additions & 4 deletions ModuleSystem/module_constants.py
View file
Expand Up @@ -2167,10 +2167,10 @@ def concatenate_scripts(block_list):
# Party count option in tweaks menu

tld_party_count_option_increment = 10
tld_party_count_option_max = 900
tld_party_count_option_min = 600
tld_party_count_option_high_crash = 901
tld_party_count_option_med_crash = 850
tld_party_count_option_max = 1500
tld_party_count_option_min = 800
tld_party_count_option_high_crash = 1101
tld_party_count_option_med_crash = 950

# Hero parties smaller than this will not siege...

Expand Down
38 changes: 23 additions & 15 deletions ModuleSystem/module_dialogs.py
View file
Expand Up @@ -2307,11 +2307,15 @@
(eq, "$g_talk_troop", ":giver_troop"),
(quest_get_slot, ":quest_target_center", "qst_destroy_scout_camp", slot_quest_object_center),
(str_store_party_name,12,":quest_target_center")],
"We saw the flames coming from the camp near {s12}. This will teach them from spying on us.^^The destruction of this camp will surely halt our enemies' advance.", "lord_generic_mission_completed",[
"Our scouts near {s12} have told us about your success. This will teach them from spying on us.^^The destruction of this camp will surely halt our enemies' advance.", "lord_generic_mission_completed",[

#Faction Strength Changes - Balance Document can be found on Google Drive: https://goo.gl/CErgSN
(str_clear, s3),
(str_clear,s4),
(str_clear, s10),
(str_clear, s14),
(str_clear, s11),
(str_clear, s13),
(str_store_string, s10, "@loses Faction Strength due to the destruction of their camp."),
(str_store_string, s14, "@gain Faction Strength as news of your victory spreads."),
(quest_get_slot, ":scout_camp_faction", "qst_destroy_scout_camp", slot_quest_target_faction),
(faction_get_slot,":enemy",":scout_camp_faction",slot_faction_strength_tmp),
(str_store_faction_name, s11, ":scout_camp_faction"),
Expand All @@ -2323,25 +2327,25 @@
(val_mul, ":level",3),
(val_add, ":level", 60),
(val_sub, ":enemy", ":level"),
(display_message,"@{s11} Loses Faction Strength due to the destruction of their camp",color_good_news),
(display_message,"@{s11} {s10}",color_good_news),
(store_troop_faction, ":quest_giver_faction", "$g_talk_troop"),
(faction_get_slot,":win",":quest_giver_faction",slot_faction_strength_tmp),
(str_store_faction_name, s13, ":quest_giver_faction"),
(val_add, ":level", 55),
(val_add, ":win", ":level"),
(display_message,"@{s13} gain Faction Strength as news of your victory spreads.",color_good_news),
(display_message,"@{s13} {s14}",color_good_news),
(else_try),
(is_between, ":level", 17,23), #Fortified Scout Camp - Enemy Loss Min: 145; Max: 170 - Hero Win Min: 200; Max: 225
(val_mul, ":level",5),
(val_add, ":level", 60),
(val_sub, ":enemy", ":level"),
(display_message,"@{s11} Loses Faction Strength due to the destruction of their camp",color_good_news),
(display_message,"@{s11} {s10}",color_good_news),
(store_troop_faction, ":quest_giver_faction", "$g_talk_troop"),
(faction_get_slot,":win",":quest_giver_faction",slot_faction_strength_tmp),
(str_store_faction_name, s13, ":quest_giver_faction"),
(val_add, ":level", 55),
(val_add, ":win", ":level"),
(display_message,"@{s13} gain Faction Strength as news of your victory spreads.",color_good_news),
(display_message,"@{s13} {s14}",color_good_news),
(try_end),
(faction_set_slot,":quest_giver_faction",slot_faction_strength_tmp,":win"),
(faction_set_slot,":scout_camp_faction",slot_faction_strength_tmp,":enemy"),
Expand All @@ -2355,12 +2359,16 @@
(eq, "$g_talk_troop", ":giver_troop"),
(quest_get_slot, ":quest_target_center", "qst_destroy_scout_camp", slot_quest_object_center),
(str_store_party_name,12,":quest_target_center")],
"We saw some of your men retreating from the scout camp near {s12}. This is disappointing, {playername}. ^^Your failure resulted in the attack of vital supply lines. It will take some time to recover.", "destroy_scout_camp_failed",[
"Our scouts near {s12} saw you and your men retreat. This is disappointing, {playername}. ^^Your failure resulted in the attack of vital supply lines. It will take some time to recover.", "destroy_scout_camp_failed",[
(call_script, "script_change_player_relation_with_troop", "$g_talk_troop", -2),

#Faction Strength Changes
(str_clear, s3),
(str_clear,s4),
(str_clear, s10),
(str_clear, s14),
(str_clear, s11),
(str_clear, s13),
(str_store_string, s10, "@have taken measure of your faction's current strength and has grown bolder."),
(str_store_string, s14, "@loses Faction Strength as supply lines were disrupted."),
(quest_get_slot, ":scout_camp_faction", "qst_destroy_scout_camp", slot_quest_target_faction),
(faction_get_slot,":enemy",":scout_camp_faction",slot_faction_strength_tmp),
(str_store_faction_name, s11, ":scout_camp_faction"),
Expand All @@ -2370,25 +2378,25 @@
(val_mul, ":level",5),
(val_add, ":level", 70),
(val_add, ":enemy", ":level"),
(display_message,"@{s11} gains Faction Strength as they have taken measure of your faction's current strength",color_bad_news),
(display_message,"@{s11} {s10}",color_bad_news),
(store_troop_faction, ":quest_giver_faction", "$g_talk_troop"),
(faction_get_slot,":loss",":quest_giver_faction",slot_faction_strength_tmp),
(str_store_faction_name, s13, ":quest_giver_faction"),
(val_add, ":level", 150),
(val_sub, ":loss", ":level"),
(display_message,"@{s13} loses Faction Strength as supply lines were disrupted.",color_bad_news),
(display_message,"@{s13} {s14}",color_bad_news),
(else_try),
(is_between, ":level", 17,23), #Fortified Scout Camp - Enemy Win Min: 270; Max: 320 - Hero Loss Min: 420; Max: 470
(val_mul, ":level",10),
(val_add, ":level", 100),
(val_add, ":enemy", ":level"),
(display_message,"@{s11} gains Faction Strength as they have taken measure of your faction's current strength",color_bad_news),
(display_message,"@{s11} {s10}",color_bad_news),
(store_troop_faction, ":quest_giver_faction", "$g_talk_troop"),
(faction_get_slot,":loss",":quest_giver_faction",slot_faction_strength_tmp),
(str_store_faction_name, s13, ":quest_giver_faction"),
(val_add, ":level", 150),
(val_sub, ":loss", ":level"),
(display_message,"@{s13} loses Faction Strength as supply lines were disrupted.",color_bad_news),
(display_message,"@{s13} {s14}",color_bad_news),
(try_end),
(faction_set_slot,":quest_giver_faction",slot_faction_strength_tmp,":loss"),
(faction_set_slot,":scout_camp_faction",slot_faction_strength_tmp,":enemy"),
Expand Down Expand Up @@ -4819,7 +4827,7 @@
(eq,"$random_quest_no","qst_destroy_scout_camp"),
(quest_get_slot, ":scout_camp_faction", "qst_destroy_scout_camp", slot_quest_target_faction),
(str_store_faction_name,s3,":scout_camp_faction")],
"{playername}, we have received word that {s3} has a scout camp nearby, Destroy it before they are able to learn about our plans.", "lord_mission_destroy_scout_camp_a",
"{playername}, we have received word that {s3} has a scout camp nearby, Make sure you are not seen and destroy it before they learn about our plans.", "lord_mission_destroy_scout_camp_a",
[]],

[anyone|plyr,"lord_mission_destroy_scout_camp_a", [],
Expand Down
2 changes: 1 addition & 1 deletion ModuleSystem/module_scripts.py
View file
Expand Up @@ -1817,7 +1817,7 @@ def set_item_faction():
(assign, "$tld_option_siege_relax_rate", 100), #50/100/200 : Siege str. req. relaxation rate
(assign, "$tld_option_regen_rate", 0), #0,1,2,3 : Str. regen rate: Normal/Halved/Battles only/None
(assign, "$tld_option_regen_limit", 500), #500/1000/1500 : Factions don't regen below
(assign, "$tld_option_max_parties", 850), #300/350/400/450...900 : Parties don't spawn after this many parties are on map.
(assign, "$tld_option_max_parties", 950), #300/350/400/450...900 : Parties don't spawn after this many parties are on map.
(assign, "$creature_ambush_counter", 5), # Starts out at 5 to give early game players some peace.
] + (is_a_wb_script==1 and [
(call_script, "script_init_camera"), #Custom Camera Initialize
Expand Down
22 changes: 20 additions & 2 deletions ModuleSystem/module_triggers.py
View file
Expand Up @@ -1510,7 +1510,25 @@
# check for mutiny when orcs in party
(2, 0, 2, [
(neg|faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
(val_sub, "$mutiny_counter",2),

## Kham - Reduce rate of mutiny by level and rank (player faction, I could also look at player's rank in mordor & isengard, but lets start with this)
(store_character_level, ":level","trp_player"),
(call_script, "script_get_faction_rank", "$players_kingdom"),
(assign, ":rank", reg0),
(store_skill_level, reg1, "skl_leadership", "trp_player"),
(this_or_next|gt, reg1, 5),
(this_or_next|gt, ":level",13),
( gt, ":rank", 3),
(try_begin), ## Reduce deduction by 1 when player is level 12 or rank 3, just to ease it a bit, before disappearing completely.
(this_or_next|eq, reg1, 5),
(this_or_next|eq, ":level",13),
( eq, ":rank", 3),
(val_sub, "$mutiny_counter",1),
(else_try),
(val_sub, "$mutiny_counter",2),
(try_end),

## Kham Changes END
(le, "$mutiny_counter",0),
(party_get_num_companion_stacks, ":num_stacks","p_main_party"),
(assign, ":orcs", 0),
Expand All @@ -1522,7 +1540,7 @@
(party_stack_get_size, reg1, "p_main_party",":stack_no"),
(val_add, ":orcs", reg1),
(try_end),
(store_skill_level, reg1, "skl_persuasion", "trp_player"), # persuasion neutralizes 5 orcs per level
(store_skill_level, reg1, "skl_leadership", "trp_player"), # persuasion neutralizes 5 orcs per level ##Kham - Change to Leadership instead, as there is nothing else persuasion is used for
(val_mul, reg1, 5),
(val_sub, ":orcs", reg1),
(troop_get_type, reg1, "trp_player"),
Expand Down
10 changes: 5 additions & 5 deletions _wb/actions.txt
View file
Expand Up @@ -467,7 +467,7 @@
ready_thrust_twohanded 1678835712 1679818762 1
0.35 anim_human 26000 26010 7 0 0 0 0 0.0
release_thrust_twohanded 1678835712 2183135242 1
0.61 anim_human 26010 26031 6 0 0 0 0 0.0
0.46 anim_human 26010 26031 6 0 0 0 0 0.0
release_thrust_twohanded_continue 0 572522497 1
0.1 anim_human 26031 26040 2 0 0 0 0 0.0
blocked_thrust_twohanded 0 35651599 1
Expand All @@ -487,7 +487,7 @@
ready_thrust_onehanded 1679884800 1679843338 1
0.35 attacks_thrust_onehanded 5 13 7 0 0 0 0 0.0
release_thrust_onehanded 1679884800 2183159818 1
0.62 attacks_thrust_onehanded 12 32 6 0 0 0 0 0.0
0.47 attacks_thrust_onehanded 12 32 6 0 0 0 0 0.0
release_thrust_onehanded_continue 0 572547073 1
0.3 attacks_thrust_onehanded 32 54 2 0 0 0 0 0.0
blocked_thrust_onehanded 512 35676175 1
Expand All @@ -497,7 +497,7 @@
ready_thrust_onehanded_horseback 1679884800 1679843338 1
0.35 attacks_thrust_onehanded 5 13 7 0 0 0 0 0.0
release_thrust_onehanded_horseback 1679884800 2183159818 1
0.62 attacks_thrust_onehanded 12 32 6 0 0 0 0 0.0
0.47 attacks_thrust_onehanded 12 32 6 0 0 0 0 0.0
release_thrust_onehanded_horseback_continue 0 572547073 1
0.3 attacks_thrust_onehanded 32 54 2 0 0 0 0 0.0
blocked_thrust_onehanded_horseback 512 35676175 1
Expand All @@ -507,7 +507,7 @@
ready_thrust_onehanded_lance 1679884800 1679843338 1
0.35 thrust_onehanded_lance_hb 5 8 7 0 0 0 0 0.0
release_thrust_onehanded_lance 1679884800 2183159818 1
0.62 thrust_onehanded_lance_hb 8 33 6 0 0 0 0 0.0
0.47 thrust_onehanded_lance_hb 8 33 6 0 0 0 0 0.0
release_thrust_onehanded_lance_continue 0 572547073 1
0.1 thrust_onehanded_lance_hb 33 45 2 0 0 0 0 0.0
blocked_thrust_onehanded_lance 512 35676175 1
Expand Down Expand Up @@ -597,7 +597,7 @@
ready_thrust_staff 1678835712 1679818762 1
0.35 attacks_staff_thrust 14 21 7 0 0 0 0 0.0
release_thrust_staff 1678835712 35651594 1
0.6 attacks_staff_thrust 21 40 6 0 0 0 0 0.0
0.45 attacks_staff_thrust 21 40 6 0 0 0 0 0.0
release_thrust_staff_continue 1678835712 572522506 1
0.6 attacks_staff_thrust 40 58 6 0 0 0 0 0.0
blocked_thrust_staff 1678770176 35651599 1
Expand Down

0 comments on commit 845e97b

Please sign in to comment.