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

Added classes GameData::Environment and GameData::BattleTerrain

Browse Source
This commit is contained in:
Maruno17
2021-02-21 18:37:26 +00:00
parent c16311326c
commit 63e640c79b
23 changed files with 368 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Data/Scripts/012_Battle/001_Battler/004_Battler_Statuses.rb
View File

@@ -60,13 +60,13 @@ class PokeBattle_Battler
# Terrains immunity
if affectedByTerrain?
case @battle.field.terrain
when PBBattleTerrains::Electric
when :Electric
if newStatus == :SLEEP
@battle.pbDisplay(_INTL("{1} surrounds itself with electrified terrain!",
pbThis(true))) if showMessages
return false
end
when PBBattleTerrains::Misty
when :Misty
@battle.pbDisplay(_INTL("{1} surrounds itself with misty terrain!",pbThis(true))) if showMessages
return false
end
@@ -175,7 +175,7 @@ class PokeBattle_Battler
# Trying to replace a status problem with another one
return false if self.status != :NONE
# Terrain immunity
return false if @battle.field.terrain==PBBattleTerrains::Misty && affectedByTerrain?
return false if @battle.field.terrain == :Misty && affectedByTerrain?
# Type immunities
hasImmuneType = false
case newStatus
@@ -282,8 +282,7 @@ class PokeBattle_Battler
def pbCanSleepYawn?
return false if self.status != :NONE
if affectedByTerrain?
return false if @battle.field.terrain==PBBattleTerrains::Electric
return false if @battle.field.terrain==PBBattleTerrains::Misty
return false if [:Electric, :Misty].include?(@battle.field.terrain)
end
if !hasActiveAbility?(:SOUNDPROOF)
@battle.eachBattler do |b|
@@ -453,7 +452,7 @@ class PokeBattle_Battler
return false
end
# Terrains immunity
if affectedByTerrain? && @battle.field.terrain==PBBattleTerrains::Misty
if affectedByTerrain? && @battle.field.terrain == :Misty
@battle.pbDisplay(_INTL("{1} surrounds itself with misty terrain!",pbThis(true))) if showMessages
return false
end

3
Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb
View File

@@ -295,8 +295,7 @@ class PokeBattle_Battler
# Move-specific failures
return false if move.pbFailsAgainstTarget?(user,target)
# Immunity to priority moves because of Psychic Terrain
if @battle.field.terrain==PBBattleTerrains::Psychic && target.affectedByTerrain? &&
target.opposes?(user) &&
if @battle.field.terrain == :Psychic && target.affectedByTerrain? && target.opposes?(user) &&
@battle.choices[user.index][4]>0 # Move priority saved from pbCalculatePriority
@battle.pbDisplay(_INTL("{1} surrounds itself with psychic terrain!",target.pbThis))
return false