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

Added SKIP_TITLE_SCREEN Setting, added const for type icon size, fixed some battle bugs and inconsistencies

Browse Source
This commit is contained in:
Maruno17
2024-06-25 15:55:10 +01:00
parent ff2d8e5f55
commit 195c34a7c8
20 changed files with 101 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/011_Battle/002_Battler/004_Battler_Statuses.rb
View File

@@ -309,8 +309,8 @@ class Battle::Battler
return true
end
def pbSleep(msg = nil)
pbInflictStatus(:SLEEP, pbSleepDuration, msg)
def pbSleep(user = nil, msg = nil)
pbInflictStatus(:SLEEP, pbSleepDuration, msg, user)
end
def pbSleepSelf(msg = nil, duration = -1)
@@ -391,8 +391,8 @@ class Battle::Battler
return pbCanInflictStatus?(:FROZEN, user, showMessages, move)
end
def pbFreeze(msg = nil)
pbInflictStatus(:FROZEN, 0, msg)
def pbFreeze(user = nil, msg = nil)
pbInflictStatus(:FROZEN, 0, msg, user)
end
#=============================================================================

1
Data/Scripts/011_Battle/002_Battler/006_Battler_AbilityAndItem.rb
View File

@@ -449,6 +449,7 @@ class Battle::Battler
end
def pbMoveTypeWeakeningBerry(berry_type, move_type, mults)
return false if !canConsumeBerry?
return if move_type != berry_type
return if !Effectiveness.super_effective?(@damageState.typeMod) && move_type != :NORMAL
mults[:final_damage_multiplier] /= 2