DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 21:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Setting SHOW_MODIFIED_MOVE_PROPERTIES, other minor tweaks and fixes

Browse Source
This commit is contained in:
Maruno17
2024-10-29 22:14:36 +00:00
parent 35be8fcf67
commit 210cfc654f
9 changed files with 144 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Data/Scripts/011_Battle/003_Move/001_Battle_Move.rb
View File

@@ -159,43 +159,38 @@ class Battle::Move
if battler.isSpecies?(:MORPEKO) || battler.effects[PBEffects::TransformSpecies] == :MORPEKO
return pbBaseType(battler)
end
# TODO: Make the below depend on a Setting rather than quoting it out.
=begin
when "TypeDependsOnUserPlate", "TypeDependsOnUserMemory",
"TypeDependsOnUserDrive", "TypeAndPowerDependOnUserBerry",
"TypeIsUserFirstType", "TypeAndPowerDependOnWeather",
"TypeAndPowerDependOnTerrain"
return pbBaseType(battler)
=end
return pbBaseType(battler) if Settings::SHOW_MODIFIED_MOVE_PROPERTIES
end
return @realMove.display_type(battler.pokemon)
end
# TODO: Make the below depend on a Setting rather than quoting it out.
def display_damage(battler)
=begin
case @function_code
when "TypeAndPowerDependOnUserBerry"
return pbNaturalGiftBaseDamage(battler.item_id)
when "TypeAndPowerDependOnWeather", "TypeAndPowerDependOnTerrain",
"PowerHigherWithUserHP", "PowerLowerWithUserHP",
"PowerHigherWithUserHappiness", "PowerLowerWithUserHappiness",
"PowerHigherWithUserPositiveStatStages", "PowerDependsOnUserStockpile"
return pbBaseType(@power, battler, nil)
def display_power(battler)
if Settings::SHOW_MODIFIED_MOVE_PROPERTIES
case @function_code
when "TypeAndPowerDependOnUserBerry"
return pbNaturalGiftBaseDamage(battler.item_id)
when "TypeAndPowerDependOnWeather", "TypeAndPowerDependOnTerrain",
"PowerHigherWithUserHP", "PowerLowerWithUserHP",
"PowerHigherWithUserHappiness", "PowerLowerWithUserHappiness",
"PowerHigherWithUserPositiveStatStages", "PowerDependsOnUserStockpile"
return pbBaseType(@power, battler, nil)
end
end
=end
return @realMove.display_damage(battler.pokemon)
return @realMove.display_power(battler.pokemon)
end
# TODO: Make the below depend on a Setting rather than quoting it out.
def display_category(battler)
=begin
case @function_code
when "CategoryDependsOnHigherDamageIgnoreTargetAbility"
pbOnStartUse(user, nil)
return @calcCategory
if Settings::SHOW_MODIFIED_MOVE_PROPERTIES
case @function_code
when "CategoryDependsOnHigherDamageIgnoreTargetAbility"
pbOnStartUse(user, nil)
return @calcCategory
end
end
=end
return @realMove.display_category(battler.pokemon)
end