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

Added effects of Mimicry/Room Service/Catching Charm, tweaked Sinistea's form chances, fixed bug in Fling about TRs.

Browse Source
This commit is contained in:
Maruno17
2021-08-14 19:07:57 +01:00
parent 153aa69bb8
commit 2112cdba37
15 changed files with 120 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
View File

@@ -193,14 +193,16 @@ module PokeBattle_BattleCommon
y = ( 65536 / ((255.0/x)**0.1875) ).floor
# Critical capture check
if Settings::ENABLE_CRITICAL_CAPTURES
c = 0
dex_modifier = 0
numOwned = $Trainer.pokedex.owned_count
if numOwned>600; c = x*5/12
elsif numOwned>450; c = x*4/12
elsif numOwned>300; c = x*3/12
elsif numOwned>150; c = x*2/12
elsif numOwned>30; c = x/12
if numOwned>600; dex_modifier = 5
elsif numOwned>450; dex_modifier = 4
elsif numOwned>300; dex_modifier = 3
elsif numOwned>150; dex_modifier = 2
elsif numOwned>30; dex_modifier = 1
end
dex_modifier *= 2 if $PokemonBag.pbHasItem?(:CATCHINGCHARM)
c = x * dex_modifier / 12
# Calculate the number of shakes
if c>0 && pbRandom(256)<c
@criticalCapture = true

3
Data/Scripts/011_Battle/003_Battle/002_PokeBattle_Battle.rb
View File

@@ -735,7 +735,8 @@ class PokeBattle_Battle
when :Psychic
pbDisplay(_INTL("The battlefield got weird!"))
end
# Check for terrain seeds that boost stats in a terrain
# Check for abilities/items that trigger upon the terrain changing
eachBattler { |b| b.pbAbilityOnTerrainChange }
eachBattler { |b| b.pbItemTerrainStatBoostCheck }
end

7
Data/Scripts/011_Battle/003_Battle/012_Battle_Phase_EndOfRound.rb
View File

@@ -119,8 +119,13 @@ class PokeBattle_Battle
pbDisplay(_INTL("The weirdness disappeared from the battlefield!"))
end
@field.terrain = :None
eachBattler { |b| b.pbAbilityOnTerrainChange }
# Start up the default terrain
pbStartTerrain(nil, @field.defaultTerrain, false) if @field.defaultTerrain != :None
if @field.defaultTerrain != :None
pbStartTerrain(nil, @field.defaultTerrain, false)
eachBattler { |b| b.pbAbilityOnTerrainChange }
eachBattler { |b| b.pbItemTerrainStatBoostCheck }
end
return if @field.terrain == :None
end
# Terrain continues