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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2020-11-25 22:07:17 +00:00
parent bba24abc1a e2dcba2169
commit 017cdb8d0f
14 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Scripts/004_Sprites/002_Sprite_Timer.rb
View File

@@ -19,6 +19,7 @@ class Sprite_Timer
def update
return if disposed?
if $game_system.timer_working
@timer.visible = true if @timer
if !@timer
@timer=Window_AdvancedTextPokemon.newWithSize("",Graphics.width-120,0,120,64)
@timer.width=@timer.borderX+96

1
Data/Scripts/012_Battle/001_Battler/001_PokeBattle_Battler.rb
View File

@@ -119,6 +119,7 @@ class PokeBattle_Battler
def statusCount=(value)
@statusCount = value
@pokemon.statusCount = value if @pokemon
@battle.scene.pbRefreshOne(@index)
end
#=============================================================================

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

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

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

@@ -3019,7 +3019,7 @@ class PokeBattle_Move_0EB < PokeBattle_Move
next if b.fainted? || b.damageState.unaffected || switchedBattlers.include?(b.index)
newPkmn = @battle.pbGetReplacementPokemonIndex(b.index,true) # Random
next if newPkmn<0
@battle.pbRecallAndReplace(b.index,newPkmn)
@battle.pbRecallAndReplace(b.index, newPkmn, true)
@battle.pbDisplay(_INTL("{1} was dragged out!",b.pbThis))
@battle.pbClearChoice(b.index) # Replacement Pokémon does nothing this round
switchedBattlers.push(b.index)
@@ -3061,7 +3061,7 @@ class PokeBattle_Move_0EC < PokeBattle_Move
next if b.hasActiveAbility?(:SUCTIONCUPS) && !@battle.moldBreaker
newPkmn = @battle.pbGetReplacementPokemonIndex(b.index,true) # Random
next if newPkmn<0
@battle.pbRecallAndReplace(b.index,newPkmn)
@battle.pbRecallAndReplace(b.index, newPkmn, true)
@battle.pbDisplay(_INTL("{1} was dragged out!",b.pbThis))
@battle.pbClearChoice(b.index) # Replacement Pokémon does nothing this round
switchedBattlers.push(b.index)
@@ -3098,7 +3098,7 @@ class PokeBattle_Move_0ED < PokeBattle_Move
return if user.fainted?
newPkmn = @battle.pbGetReplacementPokemonIndex(user.index) # Owner chooses
return if newPkmn<0
@battle.pbRecallAndReplace(user.index,newPkmn,true)
@battle.pbRecallAndReplace(user.index, newPkmn, false, true)
@battle.pbClearChoice(user.index) # Replacement Pokémon does nothing this round
@battle.moldBreaker = false
switchedBattlers.push(user.index)

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

@@ -223,11 +223,11 @@ class PokeBattle_Battle
end
# Actually performs the recalling and sending out in all situations.
def pbRecallAndReplace(idxBattler,idxParty,batonPass=false)
def pbRecallAndReplace(idxBattler,idxParty,randomReplacement=false,batonPass=false)
@scene.pbRecall(idxBattler) if !@battlers[idxBattler].fainted?
@battlers[idxBattler].pbAbilitiesOnSwitchOut # Inc. primordial weather check
@scene.pbShowPartyLineup(idxBattler&1) if pbSideSize(idxBattler)==1
pbMessagesOnReplace(idxBattler,idxParty)
pbMessagesOnReplace(idxBattler,idxParty) if !randomReplacement
pbReplace(idxBattler,idxParty,batonPass)
end

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

@@ -1238,7 +1238,7 @@ BattleHandlers::TargetItemAfterMoveUse.add(:REDCARD,
battle.pbDisplay(_INTL("{1} held up its {2} against {3}!",
battler.pbThis,battler.itemName,user.pbThis(true)))
battler.pbConsumeItem
battle.pbRecallAndReplace(user.index,newPkmn)
battle.pbRecallAndReplace(user.index, newPkmn, true)
battle.pbDisplay(_INTL("{1} was dragged out!",user.pbThis))
battle.pbClearChoice(user.index) # Replacement Pokémon does nothing this round
switched.push(user.index)

2
Data/Scripts/013_Overworld/006_PField_Battles.rb
View File

@@ -266,6 +266,7 @@ def pbWildBattleCore(*args)
$Trainer.party.each { |pkmn| playerParty.push(pkmn) }
playerPartyStarts.push(playerParty.length)
ally.party.each { |pkmn| playerParty.push(pkmn) }
setBattleRule("double") if !$PokemonTemp.battleRules["size"]
end
# Create the battle scene (the visual side of it)
scene = pbNewBattleScene
@@ -411,6 +412,7 @@ def pbTrainerBattleCore(*args)
$Trainer.party.each { |pkmn| playerParty.push(pkmn) }
playerPartyStarts.push(playerParty.length)
ally.party.each { |pkmn| playerParty.push(pkmn) }
setBattleRule("double") if !$PokemonTemp.battleRules["size"]
end
# Create the battle scene (the visual side of it)
scene = pbNewBattleScene

4
Data/Scripts/014_Trainers/001_PokeBattle_Trainer.rb
View File

@@ -169,13 +169,13 @@ class PokeBattle_Trainer
def pokedexSeen(region=-1) # Number of Pokémon seen
ret=0
if region==-1
for i in 0..PBSpecies.maxValue
for i in 1..PBSpecies.maxValue
ret+=1 if @seen[i]
end
else
regionlist=pbAllRegionalSpecies(region)
for i in regionlist
ret+=1 if @seen[i]
ret+=1 if i > 0 && @seen[i]
end
end
return ret

12
Data/Scripts/015_Items/001_PItem_Items.rb
View File

@@ -255,14 +255,12 @@ def pbRestorePP(pkmn,idxMove,pp)
return newpp-oldpp
end
def pbBattleRestorePP(pkmn,battler,idxMove,pp)
if pbRestorePP(pkmn,idxMove,pp)>0
if battler && !battler.effects[PBEffects::Transform] &&
battler.moves[idxMove] && battler.moves[idxMove].id==pkmn.moves[idxMove].id
battler.pbSetPP(battler.moves[idxMove],pkmn.moves[idxMove].pp)
end
def pbBattleRestorePP(pkmn, battler, idxMove, pp)
return if pbRestorePP(pkmn,idxMove,pp) == 0
if battler && !battler.effects[PBEffects::Transform] &&
battler.moves[idxMove] && battler.moves[idxMove].id == pkmn.moves[idxMove].id
battler.pbSetPP(battler.moves[idxMove], pkmn.moves[idxMove].pp)
end
return ret
end
#===============================================================================

2
Data/Scripts/016_Pokemon/005_Pokemon_Evolution.rb
View File

@@ -163,7 +163,7 @@ def pbGetBabySpecies(species, check_items = false, item1 = nil, item2 = nil)
end
break
end
ret = pbGetBabySpecies(ret) if ret != species
ret = pbGetBabySpecies(ret, item1, item2) if ret != species
return ret
end

2
Data/Scripts/018_Minigames/001_PMinigame_Duel.rb
View File

@@ -64,7 +64,7 @@ class PokemonDuel
@sprites["player"].x += distance_per_frame
@sprites["playerwindow"].x += distance_per_frame
@sprites["opponent"].x -= distance_per_frame
@sprites["opponentwindow"].x -= distandistance_per_framecePerFrame
@sprites["opponentwindow"].x -= distance_per_frame
Graphics.update
Input.update
pbUpdateSceneMap

2
Data/Scripts/020_System and utilities/005_PSystem_Utilities.rb
View File

@@ -908,7 +908,7 @@ def pbAllRegionalSpecies(region)
dexList = pbLoadRegionalDexes[region]
return ret if !dexList || dexList.length==0
for i in 0...dexList.length
ret[dexList[i]] = i if dexList[i]
ret[dexList[i]] = i if dexList[i] && dexList[i] > 0
end
ret.map! { |e| e ? e : 0 } # Replace nils with 0s
return ret

10
Data/Scripts/021_Debug/005_Editor_SaveData.rb
View File

@@ -1330,7 +1330,7 @@ end
# Save Shadow move data to PBS file
#===============================================================================
def pbSaveShadowMoves
moves = pbLoadShadowMovesets
shadow_movesets = pbLoadShadowMovesets
File.open("PBS/shadowmoves.txt","wb") { |f|
f.write(0xEF.chr)
f.write(0xBB.chr)
@@ -1338,14 +1338,14 @@ def pbSaveShadowMoves
f.write("\# "+_INTL("See the documentation on the wiki to learn how to edit this file."))
f.write("\r\n")
f.write("\#-------------------------------\r\n")
for i in 0...moves.length
move = moves[i]
next if !move || moves.length==0
for i in 0...shadow_movesets.length
moveset = shadow_movesets[i]
next if !moveset || moveset.length==0
constname = (getConstantName(PBSpecies,i) rescue pbGetSpeciesConst(i) rescue nil)
next if !constname
f.write(sprintf("%s = ",constname))
movenames = []
for m in move
for m in moveset
movenames.push(GameData::Move.get(m).id.to_s)
end
f.write(sprintf("%s\r\n",movenames.compact.join(",")))

3
Data/Scripts/021_Debug/010_Editor_TilesetEditor.rb
View File

@@ -101,9 +101,9 @@ class PokemonTilesetScene
@x = 0
@y = -TILE_SIZE
@topy = -TILE_SIZE
height = @sprites["tileset"].bitmap.height
pbUpdateTileset
pbFadeInAndShow(@sprites)
height = @sprites["tileset"].bitmap.height
########
loop do
Graphics.update
@@ -161,6 +161,7 @@ class PokemonTilesetScene
pbUpdateTileset
when 2
pbChooseTileset
height = @sprites["tileset"].bitmap.height
end
elsif Input.trigger?(Input::B)
if pbConfirmMessage(_INTL("Save changes?"))