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

Added class GameData::Status

Browse Source
This commit is contained in:
Maruno17
2021-02-15 23:20:51 +00:00
parent 8b5b9d5fc4
commit 6a8e4fcfa5
49 changed files with 468 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
View File

@@ -180,9 +180,9 @@ module PokeBattle_BattleCommon
b = battler.hp
x = ((3*a-2*b)*catch_rate.to_f)/(3*a)
# Calculation modifiers
if battler.status==PBStatuses::SLEEP || battler.status==PBStatuses::FROZEN
if battler.status == :SLEEP || battler.status == :FROZEN
x *= 2.5
elsif battler.status!=PBStatuses::NONE
elsif battler.status != :NONE
x *= 1.5
end
x = x.floor

2
Data/Scripts/012_Battle/003_Battle/009_Battle_Action_Other.rb
View File

@@ -48,7 +48,7 @@ class PokeBattle_Battle
else
pbDisplay(_INTL("But nothing happened!"))
end
elsif battler.status==PBStatuses::SLEEP
elsif battler.status == :SLEEP
battler.pbCureStatus
elsif battler.pbCanRaiseStatStage?(PBStats::ACCURACY,battler)
battler.pbRaiseStatStage(PBStats::ACCURACY,1,battler)

2
Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb
View File

@@ -29,7 +29,7 @@ class PokeBattle_Battle
# Check whether Pursuit can be used
next unless pbMoveCanTarget?(b.index,idxSwitcher,@choices[b.index][2].target)
next unless pbCanChooseMove?(b.index,@choices[b.index][1],false)
next if b.status==PBStatuses::SLEEP || b.status==PBStatuses::FROZEN
next if b.status == :SLEEP || b.status == :FROZEN
next if b.effects[PBEffects::SkyDrop]>=0
next if b.hasActiveAbility?(:TRUANT) && b.effects[PBEffects::Truant]
# Mega Evolve

4
Data/Scripts/012_Battle/003_Battle/012_Battle_Phase_EndOfRound.rb
View File

@@ -340,7 +340,7 @@ class PokeBattle_Battle
# Damage from poisoning
priority.each do |b|
next if b.fainted?
next if b.status!=PBStatuses::POISON
next if b.status != :POISON
if b.statusCount>0
b.effects[PBEffects::Toxic] += 1
b.effects[PBEffects::Toxic] = 15 if b.effects[PBEffects::Toxic]>15
@@ -368,7 +368,7 @@ class PokeBattle_Battle
end
# Damage from burn
priority.each do |b|
next if b.status!=PBStatuses::BURN || !b.takesIndirectDamage?
next if b.status != :BURN || !b.takesIndirectDamage?
oldHP = b.hp
dmg = (Settings::MECHANICS_GENERATION >= 7) ? b.totalhp/16 : b.totalhp/8
dmg = (dmg/2.0).round if b.hasActiveAbility?(:HEATPROOF)