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

Fixed Rollout being affected by Parental Bond, fixed multi-turn moves being stopped by Torment, fixed BGM not stopping when returning to the title screen, removed AI references

Browse Source
This commit is contained in:
Maruno17
2023-05-15 19:41:34 +01:00
parent 6ca7da0a06
commit e7e153bf11
65 changed files with 13 additions and 61094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/011_Battle/002_Battler/009_Battler_UseMoveSuccessChecks.rb
View File

@@ -61,7 +61,7 @@ class Battle::Battler
end
end
# Taunt
if @effects[PBEffects::Taunt] > 0 && move.statusMove?
if @effects[PBEffects::Taunt] > 0 && move.statusMove? && !specialUsage
if showMessages
msg = _INTL("{1} can't use {2} after the taunt!", pbThis, move.name)
(commandPhase) ? @battle.pbDisplayPaused(msg) : @battle.pbDisplay(msg)
@@ -69,7 +69,7 @@ class Battle::Battler
return false
end
# Torment
if @effects[PBEffects::Torment] && !@effects[PBEffects::Instructed] &&
if @effects[PBEffects::Torment] && !@effects[PBEffects::Instructed] && !specialUsage &&
@lastMoveUsed && move.id == @lastMoveUsed && move.id != @battle.struggle.id
if showMessages
msg = _INTL("{1} can't use the same move twice in a row due to the torment!", pbThis)