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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2020-12-31 21:08:11 +00:00
parent 20a60bfe32 cbbf6bad93
commit 63e257323b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb
View File

@@ -164,8 +164,8 @@ class PokeBattle_Battle
# Pokémon when an opponent replaces a fainted Pokémon in single # Pokémon when an opponent replaces a fainted Pokémon in single
# battles. In double battles, etc. there is no such offer. # battles. In double battles, etc. there is no such offer.
if @internalBattle && @switchStyle && trainerBattle? && pbSideSize(0)==1 && if @internalBattle && @switchStyle && trainerBattle? && pbSideSize(0)==1 &&
opposes?(idxBattler) && !@battlers[0].fainted? && pbCanChooseNonActive?(0) && opposes?(idxBattler) && !@battlers[0].fainted? && !switched.include?(0) &&
@battlers[0].effects[PBEffects::Outrage]==0 pbCanChooseNonActive?(0) && @battlers[0].effects[PBEffects::Outrage]==0
idxPartyForName = idxPartyNew idxPartyForName = idxPartyNew
enemyParty = pbParty(idxBattler) enemyParty = pbParty(idxBattler)
if enemyParty[idxPartyNew].ability == :ILLUSION if enemyParty[idxPartyNew].ability == :ILLUSION

5
Data/Scripts/021_Debug/002_Debug_MenuExtraCode.rb
View File

@@ -120,6 +120,7 @@ def pbDebugSetVariable(id,diff)
pbPlayCursorSE pbPlayCursorSE
$game_variables[id] = [$game_variables[id]+diff,99999999].min $game_variables[id] = [$game_variables[id]+diff,99999999].min
$game_variables[id] = [$game_variables[id],-99999999].max $game_variables[id] = [$game_variables[id],-99999999].max
$game_map.need_refresh = true
end end
end end
@@ -133,10 +134,12 @@ def pbDebugVariableScreen(id)
value = pbMessageChooseNumber(_INTL("Set variable {1}.",id),params) value = pbMessageChooseNumber(_INTL("Set variable {1}.",id),params)
$game_variables[id] = [value,99999999].min $game_variables[id] = [value,99999999].min
$game_variables[id] = [$game_variables[id],-99999999].max $game_variables[id] = [$game_variables[id],-99999999].max
$game_map.need_refresh = true
elsif $game_variables[id].is_a?(String) elsif $game_variables[id].is_a?(String)
value = pbMessageFreeText(_INTL("Set variable {1}.",id), value = pbMessageFreeText(_INTL("Set variable {1}.",id),
$game_variables[id],false,250,Graphics.width) $game_variables[id],false,250,Graphics.width)
$game_variables[id] = value $game_variables[id] = value
$game_map.need_refresh = true
end end
end end
@@ -162,6 +165,7 @@ def pbDebugVariables(mode)
pbPlayDecisionSE pbPlayDecisionSE
$game_switches[current_id] = !$game_switches[current_id] $game_switches[current_id] = !$game_switches[current_id]
right_window.refresh right_window.refresh
$game_map.need_refresh = true
end end
elsif mode==1 # Variables elsif mode==1 # Variables
if Input.repeat?(Input::LEFT) if Input.repeat?(Input::LEFT)
@@ -181,6 +185,7 @@ def pbDebugVariables(mode)
$game_variables[current_id] = "" $game_variables[current_id] = ""
end end
right_window.refresh right_window.refresh
$game_map.need_refresh = true
elsif Input.trigger?(Input::C) elsif Input.trigger?(Input::C)
pbPlayDecisionSE pbPlayDecisionSE
pbDebugVariableScreen(current_id) pbDebugVariableScreen(current_id)