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

Fixed error when shifting Pokémon at the end of a battle round, fixed Giratina's form code crashing if the current map doesn't have metadata, fixed item sell prices being halved twice

Browse Source
This commit is contained in:
Maruno17
2022-08-13 16:29:48 +01:00
parent 1d2f13f9c5
commit c79b970d6b
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battle/011_Battle_EndOfRoundPhase.rb
View File

@@ -579,7 +579,7 @@ class Battle
swaps.each do |pair| swaps.each do |pair|
next if pbSideSize(pair[0]) == 2 && swaps.length > 1 next if pbSideSize(pair[0]) == 2 && swaps.length > 1
next if !pbSwapBattlers(pair[0], pair[1]) next if !pbSwapBattlers(pair[0], pair[1])
case pbSideSize(side) case pbSideSize(pair[1])
when 2 when 2
pbDisplay(_INTL("{1} moved across!", @battlers[pair[1]].pbThis)) pbDisplay(_INTL("{1} moved across!", @battlers[pair[1]].pbThis))
when 3 when 3

3
Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
View File

@@ -260,8 +260,7 @@ MultipleForms.register(:ROTOM, {
MultipleForms.register(:GIRATINA, { MultipleForms.register(:GIRATINA, {
"getForm" => proc { |pkmn| "getForm" => proc { |pkmn|
next 1 if pkmn.hasItem?(:GRISEOUSORB) next 1 if pkmn.hasItem?(:GRISEOUSORB)
if $game_map && if $game_map && $game_map.metadata&.has_flag?("DistortionWorld")
GameData::MapMetadata.get($game_map.map_id)&.has_flag?("DistortionWorld")
next 1 next 1
end end
next 0 next 0

2
Data/Scripts/016_UI/020_UI_PokeMart.rb
View File

@@ -460,7 +460,6 @@ class PokemonMart_Scene
ret = 0 ret = 0
helpwindow = @sprites["helpwindow"] helpwindow = @sprites["helpwindow"]
itemprice = @adapter.getPrice(item, !@buying) itemprice = @adapter.getPrice(item, !@buying)
itemprice /= 2 if !@buying
pbDisplay(helptext, true) pbDisplay(helptext, true)
using(numwindow = Window_AdvancedTextPokemon.new("")) do # Showing number of items using(numwindow = Window_AdvancedTextPokemon.new("")) do # Showing number of items
pbPrepareWindow(numwindow) pbPrepareWindow(numwindow)
@@ -681,7 +680,6 @@ class PokemonMartScreen
@scene.pbHideMoney @scene.pbHideMoney
next next
end end
price /= 2
price *= qty price *= qty
if pbConfirm(_INTL("I can pay ${1}.\nWould that be OK?", price.to_s_formatted)) if pbConfirm(_INTL("I can pay ${1}.\nWould that be OK?", price.to_s_formatted))
old_money = @adapter.getMoney old_money = @adapter.getMoney