DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-23 06:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor

Browse Source
This commit is contained in:
Maruno17
2020-10-18 21:40:04 +01:00
parent 2be698497a e6b6bdc0b8
commit 3c2b97c21a
49 changed files with 2885 additions and 2861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -752,7 +752,7 @@ class PokeBattle_Move_09F < PokeBattle_Move
elsif isConst?(@id,PBMoves,:MULTIATTACK)
@itemTypes = {
:FIGHTINGMEMORY => :FIGHTING,
:SLYINGMEMORY => :FLYING,
:FLYINGMEMORY => :FLYING,
:POISONMEMORY => :POISON,
:GROUNDMEMORY => :GROUND,
:ROCKMEMORY => :ROCK,
@@ -1132,7 +1132,7 @@ class PokeBattle_Move_0AE < PokeBattle_Move
return false
end
def pbEffectGeneral(user)
def pbEffectAgainstTarget(user,target)
user.pbUseMoveSimple(target.lastRegularMoveUsed,target.index)
end
@@ -2403,18 +2403,19 @@ end
#===============================================================================
class PokeBattle_Move_0D3 < PokeBattle_Move
def pbBaseDamage(baseDmg,user,target)
shift = (4-user.effects[PBEffects::Rollout]) # 0-4, where 0 is most powerful
shift = (5 - user.effects[PBEffects::Rollout]) # 0-4, where 0 is most powerful
shift = 0 if user.effects[PBEffects::Rollout] == 0 # For first turn
shift += 1 if user.effects[PBEffects::DefenseCurl]
baseDmg = baseDmg << shift
baseDmg *= 2**shift
return baseDmg
end
def pbEffectAfterAllHits(user,target)
if !target.damageState.unaffected && user.effects[PBEffects::Rollout]==0
if !target.damageState.unaffected && user.effects[PBEffects::Rollout] == 0
user.effects[PBEffects::Rollout] = 5
user.currentMove = @id
end
user.effects[PBEffects::Rollout] -= 1 if user.effects[PBEffects::Rollout]>0
user.effects[PBEffects::Rollout] -= 1 if user.effects[PBEffects::Rollout] > 0
end
end