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

Merge branch 'dev' into dev-gen8

Browse Source
This commit is contained in:
Maruno17
2021-06-27 17:40:01 +01:00
parent e93b08a87b 753650acf3
commit 66169b56be
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -47,7 +47,7 @@ class PokeBattle_Move_003 < PokeBattle_SleepMove
return if @id != :RELICSONG return if @id != :RELICSONG
return if !user.isSpecies?(:MELOETTA) return if !user.isSpecies?(:MELOETTA)
return if user.hasActiveAbility?(:SHEERFORCE) && @addlEffect>0 return if user.hasActiveAbility?(:SHEERFORCE) && @addlEffect>0
newForm = (user.Form+1)%2 newForm = (user.form+1)%2
user.pbChangeForm(newForm,_INTL("{1} transformed!",user.pbThis)) user.pbChangeForm(newForm,_INTL("{1} transformed!",user.pbThis))
end end
end end

2
Data/Scripts/011_Battle/003_Battle/007_Battle_Action_UseItem.rb
View File

@@ -59,7 +59,7 @@ class PokeBattle_Battle
end end
def pbReturnUnusedItemToBag(item,idxBattler) def pbReturnUnusedItemToBag(item,idxBattler)
return if item! return if !item
useType = GameData::Item.get(item).battle_use useType = GameData::Item.get(item).battle_use
return if useType==0 || (useType>=6 && useType<=10) # Not consumed upon use return if useType==0 || (useType>=6 && useType<=10) # Not consumed upon use
if pbOwnedByPlayer?(idxBattler) if pbOwnedByPlayer?(idxBattler)