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

Condensed references to Unnerve, fixed Copycat always using Copycat

Browse Source
This commit is contained in:
Maruno17
2021-01-10 19:00:03 +00:00
parent 831555616e
commit 386396cdf6
4 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb
View File

@@ -126,8 +126,13 @@ class PokeBattle_Battler
#============================================================================= #=============================================================================
# Held item consuming/removing # Held item consuming/removing
#============================================================================= #=============================================================================
def pbCanConsumeBerry?(_item,alwaysCheckGluttony=true) def canConsumeBerry?
return false if @battle.pbCheckOpposingAbility(:UNNERVE,@index) return false if @battle.pbCheckOpposingAbility(:UNNERVE, @index)
return true
end
def canConsumePinchBerry?(_item,alwaysCheckGluttony=true)
return false if !canConsumeBerry?
return true if @hp<=@totalhp/4 return true if @hp<=@totalhp/4
if alwaysCheckGluttony || NEWEST_BATTLE_MECHANICS if alwaysCheckGluttony || NEWEST_BATTLE_MECHANICS
return true if @hp<=@totalhp/2 && hasActiveAbility?(:GLUTTONY) return true if @hp<=@totalhp/2 && hasActiveAbility?(:GLUTTONY)

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

@@ -1214,9 +1214,14 @@ class PokeBattle_Move_0AF < PokeBattle_Move
end end
end end
def pbChangeUsageCounters(user,specialUsage)
super
@copied_move = @battle.lastMoveUsed || 0
end
def pbMoveFailed?(user,targets) def pbMoveFailed?(user,targets)
if @battle.lastMoveUsed<=0 || if @copied_move<=0 ||
@moveBlacklist.include?(pbGetMoveData(@battle.lastMoveUsed,MOVE_FUNCTION_CODE)) @moveBlacklist.include?(pbGetMoveData(@copied_move,MOVE_FUNCTION_CODE))
@battle.pbDisplay(_INTL("But it failed!")) @battle.pbDisplay(_INTL("But it failed!"))
return true return true
end end
@@ -1224,7 +1229,7 @@ class PokeBattle_Move_0AF < PokeBattle_Move
end end
def pbEffectGeneral(user) def pbEffectGeneral(user)
user.pbUseMoveSimple(@battle.lastMoveUsed) user.pbUseMoveSimple(@copied_move)
end end
end end
@@ -3547,7 +3552,7 @@ class PokeBattle_Move_0F7 < PokeBattle_Move
@willFail = false @willFail = false
@willFail = true if user.item==0 || !user.itemActive? || user.unlosableItem?(user.item) @willFail = true if user.item==0 || !user.itemActive? || user.unlosableItem?(user.item)
if pbIsBerry?(user.item) if pbIsBerry?(user.item)
@willFail = true if @battle.pbCheckOpposingAbility(:UNNERVE,user.index) @willFail = true if !user.canConsumeBerry?
return return
end end
return if pbIsMegaStone?(user.item) return if pbIsMegaStone?(user.item)

4
Data/Scripts/012_Battle/006_BattleHandlers.rb
View File

@@ -491,7 +491,7 @@ FINAL_DMG_MULT = 3
def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg) def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
return false if !forced && !battler.canHeal? return false if !forced && !battler.canHeal?
return false if !forced && !battler.pbCanConsumeBerry?(item,false) return false if !forced && !battler.canConsumePinchBerry?(item,false)
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
amt = (NEWEST_BATTLE_MECHANICS) ? battler.pbRecoverHP(battler.totalhp/2) : battler.pbRecoverHP(battler.totalhp/8) amt = (NEWEST_BATTLE_MECHANICS) ? battler.pbRecoverHP(battler.totalhp/2) : battler.pbRecoverHP(battler.totalhp/8)
@@ -513,7 +513,7 @@ def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
end end
def pbBattleStatIncreasingBerry(battler,battle,item,forced,stat,increment=1) def pbBattleStatIncreasingBerry(battler,battle,item,forced,stat,increment=1)
return false if !forced && !battler.pbCanConsumeBerry?(item) return false if !forced && !battler.canConsumePinchBerry?(item)
return false if !battler.pbCanRaiseStatStage?(stat,battler) return false if !battler.pbCanRaiseStatStage?(stat,battler)
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
if forced if forced

36
Data/Scripts/012_Battle/008_BattleHandlers_Items.rb
View File

@@ -97,7 +97,7 @@ BattleHandlers::HPHealItem.add(:IAPAPABERRY,
BattleHandlers::HPHealItem.add(:LANSATBERRY, BattleHandlers::HPHealItem.add(:LANSATBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && !battler.pbCanConsumeBerry?(item) next false if !forced && !battler.canConsumePinchBerry?(item)
next false if battler.effects[PBEffects::FocusEnergy]>=2 next false if battler.effects[PBEffects::FocusEnergy]>=2
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.effects[PBEffects::FocusEnergy] = 2 battler.effects[PBEffects::FocusEnergy] = 2
@@ -126,7 +126,7 @@ BattleHandlers::HPHealItem.add(:MAGOBERRY,
BattleHandlers::HPHealItem.add(:MICLEBERRY, BattleHandlers::HPHealItem.add(:MICLEBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && !battler.pbCanConsumeBerry?(item) next false if !forced && !battler.canConsumePinchBerry?(item)
next false if !battler.effects[PBEffects::MicleBerry] next false if !battler.effects[PBEffects::MicleBerry]
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.effects[PBEffects::MicleBerry] = true battler.effects[PBEffects::MicleBerry] = true
@@ -145,7 +145,7 @@ BattleHandlers::HPHealItem.add(:MICLEBERRY,
BattleHandlers::HPHealItem.add(:ORANBERRY, BattleHandlers::HPHealItem.add(:ORANBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !battler.canHeal? next false if !battler.canHeal?
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if !forced && battler.hp>battler.totalhp/2 next false if !forced && battler.hp>battler.totalhp/2
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.pbRecoverHP(10) battler.pbRecoverHP(10)
@@ -175,7 +175,7 @@ BattleHandlers::HPHealItem.add(:SALACBERRY,
BattleHandlers::HPHealItem.add(:SITRUSBERRY, BattleHandlers::HPHealItem.add(:SITRUSBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !battler.canHeal? next false if !battler.canHeal?
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if !forced && battler.hp>battler.totalhp/2 next false if !forced && battler.hp>battler.totalhp/2
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
battler.pbRecoverHP(battler.totalhp/4) battler.pbRecoverHP(battler.totalhp/4)
@@ -213,7 +213,7 @@ BattleHandlers::HPHealItem.add(:WIKIBERRY,
BattleHandlers::StatusCureItem.add(:ASPEARBERRY, BattleHandlers::StatusCureItem.add(:ASPEARBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if battler.status!=PBStatuses::FROZEN next false if battler.status!=PBStatuses::FROZEN
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced
@@ -226,7 +226,7 @@ BattleHandlers::StatusCureItem.add(:ASPEARBERRY,
BattleHandlers::StatusCureItem.add(:CHERIBERRY, BattleHandlers::StatusCureItem.add(:CHERIBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if battler.status!=PBStatuses::PARALYSIS next false if battler.status!=PBStatuses::PARALYSIS
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced
@@ -239,7 +239,7 @@ BattleHandlers::StatusCureItem.add(:CHERIBERRY,
BattleHandlers::StatusCureItem.add(:CHESTOBERRY, BattleHandlers::StatusCureItem.add(:CHESTOBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if battler.status!=PBStatuses::SLEEP next false if battler.status!=PBStatuses::SLEEP
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced
@@ -252,7 +252,7 @@ BattleHandlers::StatusCureItem.add(:CHESTOBERRY,
BattleHandlers::StatusCureItem.add(:LUMBERRY, BattleHandlers::StatusCureItem.add(:LUMBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if battler.status==PBStatuses::NONE && next false if battler.status==PBStatuses::NONE &&
battler.effects[PBEffects::Confusion]==0 battler.effects[PBEffects::Confusion]==0
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
@@ -322,7 +322,7 @@ BattleHandlers::StatusCureItem.add(:MENTALHERB,
BattleHandlers::StatusCureItem.add(:PECHABERRY, BattleHandlers::StatusCureItem.add(:PECHABERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if battler.status!=PBStatuses::POISON next false if battler.status!=PBStatuses::POISON
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced
@@ -335,7 +335,7 @@ BattleHandlers::StatusCureItem.add(:PECHABERRY,
BattleHandlers::StatusCureItem.add(:PERSIMBERRY, BattleHandlers::StatusCureItem.add(:PERSIMBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if battler.effects[PBEffects::Confusion]==0 next false if battler.effects[PBEffects::Confusion]==0
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced
@@ -353,7 +353,7 @@ BattleHandlers::StatusCureItem.add(:PERSIMBERRY,
BattleHandlers::StatusCureItem.add(:RAWSTBERRY, BattleHandlers::StatusCureItem.add(:RAWSTBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if battler.status!=PBStatuses::BURN next false if battler.status!=PBStatuses::BURN
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced
@@ -370,7 +370,7 @@ BattleHandlers::StatusCureItem.add(:RAWSTBERRY,
BattleHandlers::PriorityBracketChangeItem.add(:CUSTAPBERRY, BattleHandlers::PriorityBracketChangeItem.add(:CUSTAPBERRY,
proc { |item,battler,subPri,battle| proc { |item,battler,subPri,battle|
next if !battler.pbCanConsumeBerry?(item) next if !battler.canConsumePinchBerry?(item)
next 1 if subPri<1 next 1 if subPri<1
} }
) )
@@ -1037,7 +1037,7 @@ BattleHandlers::TargetItemOnHit.add(:ENIGMABERRY,
BattleHandlers::TargetItemOnHit.add(:JABOCABERRY, BattleHandlers::TargetItemOnHit.add(:JABOCABERRY,
proc { |item,user,target,move,battle| proc { |item,user,target,move,battle|
next if battle.pbCheckOpposingAbility(:UNNERVE,target.index) next if !target.canConsumeBerry?
next if !move.physicalMove? next if !move.physicalMove?
next if !user.takesIndirectDamage? next if !user.takesIndirectDamage?
battle.pbCommonAnimation("EatBerry",target) battle.pbCommonAnimation("EatBerry",target)
@@ -1099,7 +1099,7 @@ BattleHandlers::TargetItemOnHit.add(:ROCKYHELMET,
BattleHandlers::TargetItemOnHit.add(:ROWAPBERRY, BattleHandlers::TargetItemOnHit.add(:ROWAPBERRY,
proc { |item,user,target,move,battle| proc { |item,user,target,move,battle|
next if battle.pbCheckOpposingAbility(:UNNERVE,target.index) next if !target.canConsumeBerry?
next if !move.specialMove? next if !move.specialMove?
next if !user.takesIndirectDamage? next if !user.takesIndirectDamage?
battle.pbCommonAnimation("EatBerry",target) battle.pbCommonAnimation("EatBerry",target)
@@ -1167,7 +1167,7 @@ BattleHandlers::TargetItemOnHit.add(:WEAKNESSPOLICY,
BattleHandlers::TargetItemOnHitPositiveBerry.add(:ENIGMABERRY, BattleHandlers::TargetItemOnHitPositiveBerry.add(:ENIGMABERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !battler.canHeal? next false if !battler.canHeal?
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced PBDebug.log("[Item triggered] #{battler.pbThis}'s #{itemName}") if forced
battle.pbCommonAnimation("EatBerry",battler) if !forced battle.pbCommonAnimation("EatBerry",battler) if !forced
@@ -1184,7 +1184,7 @@ BattleHandlers::TargetItemOnHitPositiveBerry.add(:ENIGMABERRY,
BattleHandlers::TargetItemOnHitPositiveBerry.add(:KEEBERRY, BattleHandlers::TargetItemOnHitPositiveBerry.add(:KEEBERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if !battler.pbCanRaiseStatStage?(PBStats::DEFENSE,battler) next false if !battler.pbCanRaiseStatStage?(PBStats::DEFENSE,battler)
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
if !forced if !forced
@@ -1198,7 +1198,7 @@ BattleHandlers::TargetItemOnHitPositiveBerry.add(:KEEBERRY,
BattleHandlers::TargetItemOnHitPositiveBerry.add(:MARANGABERRY, BattleHandlers::TargetItemOnHitPositiveBerry.add(:MARANGABERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
next false if !battler.pbCanRaiseStatStage?(PBStats::SPDEF,battler) next false if !battler.pbCanRaiseStatStage?(PBStats::SPDEF,battler)
itemName = PBItems.getName(item) itemName = PBItems.getName(item)
if !forced if !forced
@@ -1285,7 +1285,7 @@ BattleHandlers::UserItemAfterMoveUse.add(:SHELLBELL,
BattleHandlers::EndOfMoveItem.add(:LEPPABERRY, BattleHandlers::EndOfMoveItem.add(:LEPPABERRY,
proc { |item,battler,battle,forced| proc { |item,battler,battle,forced|
next false if !forced && battle.pbCheckOpposingAbility(:UNNERVE,battler.index) next false if !forced && !battler.canConsumeBerry?
found = [] found = []
battler.pokemon.moves.each_with_index do |m,i| battler.pokemon.moves.each_with_index do |m,i|
next if !m || m.id==0 next if !m || m.id==0