DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +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

1
Data/Scripts/003_Game processing/002_Scene_Map.rb
View File

@@ -233,6 +233,7 @@ class Scene_Map
if $game_temp.title_screen_calling
pbMapInterpreter.command_end if pbMapInterpreterRunning?
$game_temp.title_screen_calling = false
pbBGMFade(1.0)
Graphics.transition
Graphics.freeze
end

10
Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb
View File

@@ -47,7 +47,7 @@ class Window_UnformattedTextPokemon < SpriteWindow_Base
return ret
end
def resizeToFitInternal(text, maxwidth) # maxwidth is maximum acceptable window width
def resizeToFitInternal(text, maxwidth) # maxwidth is maximum acceptable window width
dims = [0, 0]
cwidth = maxwidth < 0 ? Graphics.width : maxwidth
getLineBrokenChunks(self.contents, text,
@@ -173,7 +173,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
moveCursor
end
def lineHeight(value)
def lineHeight=(value)
@lineHeight = value
self.text = self.text
end
@@ -296,7 +296,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
width = 1
height = 1
numlines = 0
visiblelines = (self.height - self.borderY) / 32
visiblelines = (self.height - self.borderY) / @lineHeight
if value.length == 0
@fmtchars = []
@bitmapwidth = width
@@ -307,7 +307,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
@fmtchars = []
fmt = getFormattedText(self.contents, 0, 0,
self.width - self.borderX - SpriteWindow_Base::TEXT_PADDING, -1,
shadowc3tag(@baseColor, @shadowColor) + value, 32, true)
shadowc3tag(@baseColor, @shadowColor) + value, @lineHeight, true)
@oldfont = self.contents.font.clone
fmt.each do |ch|
chx = ch[1] + ch[3]
@@ -334,7 +334,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
else
@fmtchars = getFormattedText(self.contents, 0, 0,
self.width - self.borderX - SpriteWindow_Base::TEXT_PADDING, -1,
shadowc3tag(@baseColor, @shadowColor) + value, 32, true)
shadowc3tag(@baseColor, @shadowColor) + value, @lineHeight, true)
@oldfont = self.contents.font.clone
@fmtchars.each do |ch|
chx = ch[1] + ch[3]

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)

2
Data/Scripts/011_Battle/003_Move/009_MoveEffects_MultiHit.rb
View File

@@ -536,6 +536,8 @@ end
# Power is also doubled if user has curled up. (Ice Ball, Rollout)
#===============================================================================
class Battle::Move::MultiTurnAttackPowersUpEachTurn < Battle::Move
def pbNumHits(user, targets); return 1; end
def pbBaseDamage(baseDmg, user, target)
shift = (5 - user.effects[PBEffects::Rollout]) # 0-4, where 0 is most powerful
shift = 0 if user.effects[PBEffects::Rollout] == 0 # For first turn

3
Data/Scripts/011_Battle/003_Move/013_MoveEffects_SwitchingActing.rb
View File

@@ -756,6 +756,9 @@ end
#===============================================================================
# The target can no longer use the same move twice in a row. (Torment)
# NOTE: Torment is only supposed to start applying at the end of the round in
# which it is used, unlike Taunt which starts applying immediately. I've
# decided to make Torment apply immediately.
#===============================================================================
class Battle::Move::DisableTargetUsingSameMoveConsecutively < Battle::Move
def ignoresSubstitute?(user); return true; end