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

Deleted rubyscreen.dll, eradicated semicolons from when... statements, compiling is now before setting up the system, appeased vocal dissenters

Browse Source
This commit is contained in:
Maruno17
2020-11-26 21:10:45 +00:00
parent 017cdb8d0f
commit eb22e49d9b
73 changed files with 905 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/012_Battle/002_Move/003_Move_Usage_Calculations.rb
View File

@@ -182,8 +182,8 @@ class PokeBattle_Move
return false if c<0
# Move-specific "always/never a critical hit" effects
case pbCritialOverride(user,target)
when 1; return true
when -1; return false
when 1 then return true
when -1 then return false
end
# Other effects
return true if c>50 # Merciless

42
Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -366,9 +366,9 @@ class PokeBattle_Move_017 < PokeBattle_Move
def pbAdditionalEffect(user,target)
return if target.damageState.substitute
case @battle.pbRandom(3)
when 0; target.pbBurn(user) if target.pbCanBurn?(user,false,self)
when 1; target.pbFreeze if target.pbCanFreeze?(user,false,self)
when 2; target.pbParalyze(user) if target.pbCanParalyze?(user,false,self)
when 0 then target.pbBurn(user) if target.pbCanBurn?(user, false, self)
when 1 then target.pbFreeze if target.pbCanFreeze?(user, false, self)
when 2 then target.pbParalyze(user) if target.pbCanParalyze?(user, false, self)
end
end
end
@@ -1893,24 +1893,24 @@ class PokeBattle_Move_060 < PokeBattle_Move
end
if !checkedTerrain
case @battle.environment
when PBEnvironment::Grass; @newType = getID(PBTypes,:GRASS)
when PBEnvironment::TallGrass; @newType = getID(PBTypes,:GRASS)
when PBEnvironment::MovingWater; @newType = getID(PBTypes,:WATER)
when PBEnvironment::StillWater; @newType = getID(PBTypes,:WATER)
when PBEnvironment::Puddle; @newType = getID(PBTypes,:WATER)
when PBEnvironment::Underwater; @newType = getID(PBTypes,:WATER)
when PBEnvironment::Cave; @newType = getID(PBTypes,:ROCK)
when PBEnvironment::Rock; @newType = getID(PBTypes,:GROUND)
when PBEnvironment::Sand; @newType = getID(PBTypes,:GROUND)
when PBEnvironment::Forest; @newType = getID(PBTypes,:BUG)
when PBEnvironment::ForestGrass; @newType = getID(PBTypes,:BUG)
when PBEnvironment::Snow; @newType = getID(PBTypes,:ICE)
when PBEnvironment::Ice; @newType = getID(PBTypes,:ICE)
when PBEnvironment::Volcano; @newType = getID(PBTypes,:FIRE)
when PBEnvironment::Graveyard; @newType = getID(PBTypes,:GHOST)
when PBEnvironment::Sky; @newType = getID(PBTypes,:FLYING)
when PBEnvironment::Space; @newType = getID(PBTypes,:DRAGON)
when PBEnvironment::UltraSpace; @newType = getID(PBTypes,:PSYCHIC)
when PBEnvironment::Grass then @newType = getID(PBTypes,:GRASS)
when PBEnvironment::TallGrass then @newType = getID(PBTypes,:GRASS)
when PBEnvironment::MovingWater then @newType = getID(PBTypes,:WATER)
when PBEnvironment::StillWater then @newType = getID(PBTypes,:WATER)
when PBEnvironment::Puddle then @newType = getID(PBTypes,:WATER)
when PBEnvironment::Underwater then @newType = getID(PBTypes,:WATER)
when PBEnvironment::Cave then @newType = getID(PBTypes,:ROCK)
when PBEnvironment::Rock then @newType = getID(PBTypes,:GROUND)
when PBEnvironment::Sand then @newType = getID(PBTypes,:GROUND)
when PBEnvironment::Forest then @newType = getID(PBTypes,:BUG)
when PBEnvironment::ForestGrass then @newType = getID(PBTypes,:BUG)
when PBEnvironment::Snow then @newType = getID(PBTypes,:ICE)
when PBEnvironment::Ice then @newType = getID(PBTypes,:ICE)
when PBEnvironment::Volcano then @newType = getID(PBTypes,:FIRE)
when PBEnvironment::Graveyard then @newType = getID(PBTypes,:GHOST)
when PBEnvironment::Sky then @newType = getID(PBTypes,:FLYING)
when PBEnvironment::Space then @newType = getID(PBTypes,:DRAGON)
when PBEnvironment::UltraSpace then @newType = getID(PBTypes,:PSYCHIC)
end
end
if !user.pbHasOtherType?(@newType)

28
Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb
View File

@@ -958,20 +958,20 @@ class PokeBattle_Move_0A4 < PokeBattle_Move
def pbShowAnimation(id,user,targets,hitNum=0,showAnimation=true)
id = :BODYSLAM # Environment-specific anim
case @secretPower
when 1; id = :THUNDERSHOCK if GameData::Move.exists?(:THUNDERSHOCK)
when 2; id = :VINEWHIP if GameData::Move.exists?(:VINEWHIP)
when 3; id = :FAIRYWIND if GameData::Move.exists?(:FAIRYWIND)
when 4; id = :CONFUSIO if GameData::Move.exists?(:CONFUSION)
when 5; id = :WATERPULSE if GameData::Move.exists?(:WATERPULSE)
when 6; id = :MUDSHOT if GameData::Move.exists?(:MUDSHOT)
when 7; id = :ROCKTHROW if GameData::Move.exists?(:ROCKTHROW)
when 8; id = :MUDSLAP if GameData::Move.exists?(:MUDSLAP)
when 9; id = :ICESHARD if GameData::Move.exists?(:ICESHARD)
when 10; id = :INCINERATE if GameData::Move.exists?(:INCINERATE)
when 11; id = :SHADOWSNEAK if GameData::Move.exists?(:SHADOWSNEAK)
when 12; id = :GUST if GameData::Move.exists?(:GUST)
when 13; id = :SWIFT if GameData::Move.exists?(:SWIFT)
when 14; id = :PSYWAVE if GameData::Move.exists?(:PSYWAVE)
when 1 then id = :THUNDERSHOCK if GameData::Move.exists?(:THUNDERSHOCK)
when 2 then id = :VINEWHIP if GameData::Move.exists?(:VINEWHIP)
when 3 then id = :FAIRYWIND if GameData::Move.exists?(:FAIRYWIND)
when 4 then id = :CONFUSIO if GameData::Move.exists?(:CONFUSION)
when 5 then id = :WATERPULSE if GameData::Move.exists?(:WATERPULSE)
when 6 then id = :MUDSHOT if GameData::Move.exists?(:MUDSHOT)
when 7 then id = :ROCKTHROW if GameData::Move.exists?(:ROCKTHROW)
when 8 then id = :MUDSLAP if GameData::Move.exists?(:MUDSLAP)
when 9 then id = :ICESHARD if GameData::Move.exists?(:ICESHARD)
when 10 then id = :INCINERATE if GameData::Move.exists?(:INCINERATE)
when 11 then id = :SHADOWSNEAK if GameData::Move.exists?(:SHADOWSNEAK)
when 12 then id = :GUST if GameData::Move.exists?(:GUST)
when 13 then id = :SWIFT if GameData::Move.exists?(:SWIFT)
when 14 then id = :PSYWAVE if GameData::Move.exists?(:PSYWAVE)
end
super
end

6
Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
View File

@@ -563,9 +563,9 @@ class PokeBattle_Move_114 < PokeBattle_Move
def pbEffectGeneral(user)
hpGain = 0
case [user.effects[PBEffects::Stockpile],1].max
when 1; hpGain = user.totalhp/4
when 2; hpGain = user.totalhp/2
when 3; hpGain = user.totalhp
when 1 then hpGain = user.totalhp/4
when 2 then hpGain = user.totalhp/2
when 3 then hpGain = user.totalhp
end
if user.pbRecoverHP(hpGain)>0
@battle.pbDisplay(_INTL("{1}'s HP was restored.",user.pbThis))