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

Fixed typo in Duel minigame, fixed crash when battling a single trainer while you have a

Browse Source
This commit is contained in:
Maruno17
2020-11-11 22:09:34 +00:00
parent 5534f338e7
commit 9841bd2630
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 !isConst?(@id,PBMoves,:RELICSONG) return if !isConst?(@id,PBMoves,: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 = (oldForm+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/013_Overworld/006_PField_Battles.rb
View File

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

3
Data/Scripts/013_Overworld/009_PField_RoamingPokemon.rb
View File

@@ -183,7 +183,8 @@ EncounterModifier.register(proc { |encounter|
# are in the same region # are in the same region
if roamerMap!=$game_map.map_id if roamerMap!=$game_map.map_id
currentRegion = pbGetCurrentRegion currentRegion = pbGetCurrentRegion
next if pbGetMetadata(roamerMap,MetadataMapPosition)[0]!=currentRegion map_position = pbGetMetadata(roamerMap,MetadataMapPosition)
next if !map_position || map_position[0] != currentRegion
currentMapName = pbGetMessage(MessageTypes::MapNames,$game_map.map_id) currentMapName = pbGetMessage(MessageTypes::MapNames,$game_map.map_id)
next if pbGetMessage(MessageTypes::MapNames,roamerMap)!=currentMapName next if pbGetMessage(MessageTypes::MapNames,roamerMap)!=currentMapName
end 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["player"].x += distance_per_frame
@sprites["playerwindow"].x += distance_per_frame @sprites["playerwindow"].x += distance_per_frame
@sprites["opponent"].x -= distance_per_frame @sprites["opponent"].x -= distance_per_frame
@sprites["opponentwindow"].x -= distandistance_per_framecePerFrame @sprites["opponentwindow"].x -= distance_per_frame
Graphics.update Graphics.update
Input.update Input.update
pbUpdateSceneMap pbUpdateSceneMap