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

16
Data/Scripts/011_Battle/007_Other battle code/008_Battle_AbilityEffects.rb
View File

@@ -205,12 +205,12 @@ module Battle::AbilityEffects
DamageCalcFromTargetAlly.trigger(ability, user, target, move, mults, power, type)
end
def self.triggerCriticalCalcFromUser(ability, user, target, crit_stage)
return trigger(CriticalCalcFromUser, ability, user, target, crit_stage, ret: crit_stage)
def self.triggerCriticalCalcFromUser(ability, user, target, move, crit_stage)
return trigger(CriticalCalcFromUser, ability, user, target, move, crit_stage, ret: crit_stage)
end
def self.triggerCriticalCalcFromTarget(ability, user, target, crit_stage)
return trigger(CriticalCalcFromTarget, ability, user, target, crit_stage, ret: crit_stage)
def self.triggerCriticalCalcFromTarget(ability, user, target, move, crit_stage)
return trigger(CriticalCalcFromTarget, ability, user, target, move, crit_stage, ret: crit_stage)
end
#=============================================================================
@@ -1693,13 +1693,13 @@ Battle::AbilityEffects::DamageCalcFromTargetAlly.add(:FRIENDGUARD,
#===============================================================================
Battle::AbilityEffects::CriticalCalcFromUser.add(:MERCILESS,
proc { |ability, user, target, c|
proc { |ability, user, target, move, c|
next 99 if target.poisoned?
}
)
Battle::AbilityEffects::CriticalCalcFromUser.add(:SUPERLUCK,
proc { |ability, user, target, c|
proc { |ability, user, target, move, c|
next c + 1
}
)
@@ -1709,7 +1709,7 @@ Battle::AbilityEffects::CriticalCalcFromUser.add(:SUPERLUCK,
#===============================================================================
Battle::AbilityEffects::CriticalCalcFromTarget.add(:BATTLEARMOR,
proc { |ability, user, target, c|
proc { |ability, user, target, move, c|
next -1
}
)
@@ -1847,7 +1847,7 @@ Battle::AbilityEffects::OnBeingHit.add(:EFFECTSPORE,
msg = _INTL("{1}'s {2} made {3} fall asleep!", target.pbThis,
target.abilityName, user.pbThis(true))
end
user.pbSleep(msg)
user.pbSleep(target, msg)
end
when 1
if user.pbCanPoison?(target, Battle::Scene::USE_ABILITY_SPLASH)

14
Data/Scripts/011_Battle/007_Other battle code/009_Battle_ItemEffects.rb
View File

@@ -125,12 +125,12 @@ module Battle::ItemEffects
DamageCalcFromTarget.trigger(item, user, target, move, mults, power, type)
end
def self.triggerCriticalCalcFromUser(item, user, target, crit_stage)
return trigger(CriticalCalcFromUser, item, user, target, crit_stage, ret: crit_stage)
def self.triggerCriticalCalcFromUser(item, user, target, move, crit_stage)
return trigger(CriticalCalcFromUser, item, user, target, move, crit_stage, ret: crit_stage)
end
def self.triggerCriticalCalcFromTarget(item, user, target, crit_stage)
return trigger(CriticalCalcFromTarget, item, user, target, crit_stage, ret: crit_stage)
def self.triggerCriticalCalcFromTarget(item, user, target, move, crit_stage)
return trigger(CriticalCalcFromTarget, item, user, target, move, crit_stage, ret: crit_stage)
end
#=============================================================================
@@ -1280,13 +1280,13 @@ Battle::ItemEffects::DamageCalcFromTarget.add(:YACHEBERRY,
#===============================================================================
Battle::ItemEffects::CriticalCalcFromUser.add(:LUCKYPUNCH,
proc { |item, user, target, c|
proc { |item, user, target, move, c|
next c + 2 if user.isSpecies?(:CHANSEY)
}
)
Battle::ItemEffects::CriticalCalcFromUser.add(:RAZORCLAW,
proc { |item, user, target, c|
proc { |item, user, target, move, c|
next c + 1
}
)
@@ -1294,7 +1294,7 @@ Battle::ItemEffects::CriticalCalcFromUser.add(:RAZORCLAW,
Battle::ItemEffects::CriticalCalcFromUser.copy(:RAZORCLAW, :SCOPELENS)
Battle::ItemEffects::CriticalCalcFromUser.add(:LEEK,
proc { |item, user, target, c|
proc { |item, user, target, move, c|
next c + 2 if user.isSpecies?(:FARFETCHD) || user.isSpecies?(:SIRFETCHD)
}
)