-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
u240.3 fixes and code formatting for everything
- Loading branch information
1 parent
c1c003f
commit 98fc51f
Showing
20 changed files
with
1,559 additions
and
1,181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,26 @@ | ||
| -- Burglar concealment visual | ||
| local old_conceal_modifier = BlackMarketManager.concealment_modifier | ||
| function BlackMarketManager:concealment_modifier(type, upgrade_level) | ||
| modifier = old_conceal_modifier(self, type, upgrade_level) | ||
| if type == "armors" then | ||
| modifier = modifier + managers.player:upgrade_value("player", "passive_burglar_concealment_addend", 0) | ||
| end | ||
| return modifier | ||
| modifier = old_conceal_modifier(self, type, upgrade_level) | ||
| if type == "armors" then | ||
| modifier = modifier | ||
| + managers.player:upgrade_value( | ||
| "player", | ||
| "passive_burglar_concealment_addend", | ||
| 0 | ||
| ) | ||
| end | ||
| return modifier | ||
| end | ||
| -- Burglar concealment functional | ||
| local old_visibility_modifiers = BlackMarketManager.visibility_modifiers | ||
| function BlackMarketManager:visibility_modifiers() | ||
| local skill_bonuses = old_visibility_modifiers(self) | ||
| skill_bonuses = skill_bonuses - managers.player:upgrade_value("player", "passive_burglar_concealment_addend", 0) | ||
| return skill_bonuses | ||
| end | ||
| local skill_bonuses = old_visibility_modifiers(self) | ||
| skill_bonuses = skill_bonuses | ||
| - managers.player:upgrade_value( | ||
| "player", | ||
| "passive_burglar_concealment_addend", | ||
| 0 | ||
| ) | ||
| return skill_bonuses | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,19 @@ | ||
| local old_incendiary_fire = EnvEffectTweakData.incendiary_fire | ||
| function EnvEffectTweakData:incendiary_fire() | ||
| local params = old_incendiary_fire(self) | ||
| params.damage = 25 | ||
| params.fire_dot_data.dot_damage = 1 | ||
| params.fire_dot_data.dot_trigger_chance = 25 | ||
| return params | ||
| end | ||
| local old_incendiary_fire_arbiter = EnvEffectTweakData.incendiary_fire_arbiter | ||
| function EnvEffectTweakData:incendiary_fire_arbiter() | ||
| local params = old_incendiary_fire_arbiter(self) | ||
| params.damage = 25 | ||
| params.fire_dot_data.dot_damage = 1 | ||
| params.fire_dot_data.dot_trigger_chance = 25 | ||
| return params | ||
| end | ||
| --[[ | ||
| local old_incendiary_fire = EnvEffectTweakData.incendiary_fire | ||
| function EnvEffectTweakData:incendiary_fire() | ||
| local params = old_incendiary_fire(self) | ||
| params.damage = 25 | ||
| params.fire_dot_data.dot_damage = 1 | ||
| params.fire_dot_data.dot_trigger_chance = 25 | ||
| return params | ||
| end | ||
| local old_incendiary_fire_arbiter = EnvEffectTweakData.incendiary_fire_arbiter | ||
| function EnvEffectTweakData:incendiary_fire_arbiter() | ||
| local params = old_incendiary_fire_arbiter(self) | ||
| params.damage = 25 | ||
| params.fire_dot_data.dot_damage = 1 | ||
| params.fire_dot_data.dot_trigger_chance = 25 | ||
| return params | ||
| end | ||
| ]] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,41 @@ | ||
| function NewRaycastWeaponBase:__check_weapon_category(category) | ||
| for _,type in ipairs(self:weapon_tweak_data().categories) do | ||
| if type == category then | ||
| return true | ||
| end | ||
| end | ||
| return false | ||
| for _, type in ipairs(self:weapon_tweak_data().categories) do | ||
| if type == category then | ||
| return true | ||
| end | ||
| end | ||
| return false | ||
| end | ||
| BetterRebalanceTable:PostHook(NewRaycastWeaponBase, "_update_stats_values", | ||
| function(self) | ||
| -- Make trigger happy give pistols shield piercing | ||
| if managers.player:has_category_upgrade("pistol", "pierce_enemy_armor") then | ||
| if self:__check_weapon_category("pistol") and not self._can_shoot_through_enemy | ||
| and self._armor_piercing_chance ~= 1 | ||
| then | ||
| self._can_shoot_through_enemy = true | ||
| self._armor_piercing_chance = 1 | ||
| end | ||
| end | ||
| -- Reimplement movement speed penalties | ||
| self._movement_penalty = self:weapon_tweak_data().movement_speed | ||
| -- Make iron man basic remove speed penalties | ||
| if managers.player:has_category_upgrade("player", "armor_multiplier") then | ||
| self._movement_penalty = 1 | ||
| end | ||
| end) | ||
| BetterRebalanceTable:PostHook(NewRaycastWeaponBase, "init", | ||
| function(self) | ||
| -- initialize movement speed penalties | ||
| self._movement_penalty = self:weapon_tweak_data().movement_speed | ||
|
|
||
| BetterRebalanceTable:PostHook( | ||
| NewRaycastWeaponBase, | ||
| "_update_stats_values", | ||
| function(self) | ||
| -- Make trigger happy give pistols shield piercing | ||
| if | ||
| managers.player:has_category_upgrade("pistol", "pierce_enemy_armor") | ||
| then | ||
| if | ||
| self:__check_weapon_category("pistol") | ||
| and not self._can_shoot_through_enemy | ||
| and self._armor_piercing_chance ~= 1 | ||
| then | ||
| self._can_shoot_through_enemy = true | ||
| self._armor_piercing_chance = 1 | ||
| end | ||
| end | ||
| -- Reimplement movement speed penalties | ||
| self._movement_penalty = self:weapon_tweak_data().movement_speed | ||
| -- Make iron man basic remove speed penalties | ||
| if | ||
| managers.player:has_category_upgrade("player", "armor_multiplier") | ||
| then | ||
| self._movement_penalty = 1 | ||
| end | ||
| end | ||
| ) | ||
|
|
||
| BetterRebalanceTable:PostHook(NewRaycastWeaponBase, "init", function(self) | ||
| -- initialize movement speed penalties | ||
| self._movement_penalty = self:weapon_tweak_data().movement_speed | ||
| end) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,57 @@ | ||
| -- Implement Hitman armor regen | ||
| BetterRebalanceTable:PostHook(PlayerDamage, "_calc_armor_damage", | ||
| function(self) | ||
| if self:get_real_armor() <= 0 then | ||
| if managers.player:has_inactivate_temporary_upgrade("temporary", "regen_all_armor") then | ||
| managers.player:activate_temporary_upgrade("temporary", "regen_all_armor") | ||
| self:_start_regen_on_the_side(managers.player:temporary_upgrade_value("temporary", "regen_all_armor", 0)) | ||
| end | ||
| end | ||
| BetterRebalanceTable:PostHook(PlayerDamage, "_calc_armor_damage", function(self) | ||
| if self:get_real_armor() <= 0 then | ||
| if | ||
| managers.player:has_inactivate_temporary_upgrade( | ||
| "temporary", | ||
| "regen_all_armor" | ||
| ) | ||
| then | ||
| managers.player:activate_temporary_upgrade( | ||
| "temporary", | ||
| "regen_all_armor" | ||
| ) | ||
| self:_start_regen_on_the_side( | ||
| managers.player:temporary_upgrade_value( | ||
| "temporary", | ||
| "regen_all_armor", | ||
| 0 | ||
| ) | ||
| ) | ||
| end | ||
| end | ||
| end) | ||
|
|
||
| -- Yakuza Frenzy HP stuffs | ||
| BetterRebalanceTable:PostHook(PlayerDamage, "init", | ||
| function(self) | ||
| local yakuza_reduction = managers.player:upgrade_value_nil("player", "passive_frenzy_health") | ||
| if managers.player:has_category_upgrade("player", "passive_frenzy_health") and yakuza_reduction then | ||
| self._max_health_reduction = yakuza_reduction --[[ Leaves approx 1 hp with/without a convert, maybe not with CC upgrades | ||
| BetterRebalanceTable:PostHook(PlayerDamage, "init", function(self) | ||
| local yakuza_reduction = | ||
| managers.player:upgrade_value_nil("player", "passive_frenzy_health") | ||
| if | ||
| managers.player:has_category_upgrade("player", "passive_frenzy_health") | ||
| and yakuza_reduction | ||
| then | ||
| self._max_health_reduction = yakuza_reduction --[[ Leaves approx 1 hp with/without a convert, maybe not with CC upgrades | ||
| But it's the best option without remaking large functions tbh ]] | ||
| end | ||
| end | ||
| end) | ||
| BetterRebalanceTable:PostHook(PlayerDamage, "copr_update_attack_data", | ||
| function(self, attack_data) | ||
| if managers.player:has_activate_temporary_upgrade("temporary", "copr_ability") then | ||
| local static_damage_ratio = managers.player:upgrade_value_nil("player", "copr_static_damage_ratio") | ||
| if static_damage_ratio and attack_data.damage > 0 then | ||
| attack_data.damage = self:_max_health() * static_damage_ratio | ||
|
|
||
| BetterRebalanceTable:PostHook( | ||
| PlayerDamage, | ||
| "copr_update_attack_data", | ||
| function(self, attack_data) | ||
| if | ||
| managers.player:has_activate_temporary_upgrade( | ||
| "temporary", | ||
| "copr_ability" | ||
| ) | ||
| then | ||
| local static_damage_ratio = managers.player:upgrade_value_nil( | ||
| "player", | ||
| "copr_static_damage_ratio" | ||
| ) | ||
| if static_damage_ratio and attack_data.damage > 0 then | ||
| attack_data.damage = self:_max_health() * static_damage_ratio | ||
| end | ||
| end | ||
| end | ||
| end) | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,25 @@ | ||
| -- Add our own network event ID | ||
| BetterRebalanceTable:PostHook(PlayerInventory, "init", | ||
| function() | ||
| PlayerInventory._NET_EVENTS.BBR_share_ammo = 10 | ||
| BetterRebalanceTable:PostHook(PlayerInventory, "init", function() | ||
| PlayerInventory._NET_EVENTS.BBR_share_ammo = 10 | ||
| end) | ||
|
|
||
| -- Add a handler for our own network event | ||
| local old_sync_net_event = PlayerInventory.sync_net_event | ||
| function PlayerInventory:sync_net_event(event, peer) | ||
| if self._unit:base().is_local_player then | ||
| if self._unit:base().is_local_player then | ||
| return | ||
| end | ||
| if event == PlayerInventory._NET_EVENTS.BBR_share_ammo then | ||
| local _player = managers.player:local_player() | ||
| if alive(_player) and _player:character_damage() and not | ||
| _player:character_damage():is_downed() and not _player:character_damage():dead() | ||
| then | ||
| managers.player:add_ammo_to_pool(0.05) | ||
| end | ||
| else | ||
| old_sync_net_event(self, event, peer) | ||
| end | ||
| end | ||
| if event == PlayerInventory._NET_EVENTS.BBR_share_ammo then | ||
| local _player = managers.player:local_player() | ||
| if | ||
| alive(_player) | ||
| and _player:character_damage() | ||
| and not _player:character_damage():is_downed() | ||
| and not _player:character_damage():dead() | ||
| then | ||
| managers.player:add_ammo_to_pool(0.05) | ||
| end | ||
| else | ||
| old_sync_net_event(self, event, peer) | ||
| end | ||
| end |
Oops, something went wrong.