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

Fixed battle rule "forceCatchIntoParty" being circumventable, fixed wrong message when sending a party Pokémon to storage and replacing it with a caught Pokémon

Browse Source
This commit is contained in:
Maruno17
2022-07-07 20:42:23 +01:00
parent e1dc7c91bc
commit b50ce948f6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/007_Objects and windows/011_Messages.rb
View File

@@ -30,7 +30,7 @@ def pbEventCommentInput(*args)
return nil if list.nil? return nil if list.nil?
return nil unless list.is_a?(Array) return nil unless list.is_a?(Array)
list.each do |item| list.each do |item|
next if ![108, 108].include?(item.code) next if ![108, 408].include?(item.code)
next if item.parameters[0] != trigger next if item.parameters[0] != trigger
start = list.index(item) + 1 start = list.index(item) + 1
finish = start + elements finish = start + elements

5
Data/Scripts/011_Battle/006_Other battle code/005_Battle_CatchAndStoreMixin.rb
View File

@@ -26,7 +26,7 @@ module Battle::CatchAndStoreMixin
when 0 # Add to your party when 0 # Add to your party
pbDisplay(_INTL("Choose a Pokémon in your party to send to your Boxes.")) pbDisplay(_INTL("Choose a Pokémon in your party to send to your Boxes."))
party_index = -1 party_index = -1
@scene.pbPartyScreen(0, true, 1) { |idxParty, _partyScene| @scene.pbPartyScreen(0, (@sendToBoxes != 2), 1) { |idxParty, _partyScene|
party_index = idxParty party_index = idxParty
next true next true
} }
@@ -43,8 +43,9 @@ module Battle::CatchAndStoreMixin
# this would take a surprising amount of code, and it's very # this would take a surprising amount of code, and it's very
# unlikely to be needed anyway, so I'm ignoring it for now. # unlikely to be needed anyway, so I'm ignoring it for now.
send_pkmn = pbPlayer.party[party_index] send_pkmn = pbPlayer.party[party_index]
box_name = @peer.pbStorePokemon(pbPlayer, send_pkmn) stored_box = @peer.pbStorePokemon(pbPlayer, send_pkmn)
pbPlayer.party.delete_at(party_index) pbPlayer.party.delete_at(party_index)
box_name = @peer.pbBoxName(stored_box)
pbDisplayPaused(_INTL("{1} has been sent to Box \"{2}\".", send_pkmn.name, box_name)) pbDisplayPaused(_INTL("{1} has been sent to Box \"{2}\".", send_pkmn.name, box_name))
# Rearrange all remembered properties of party Pokémon # Rearrange all remembered properties of party Pokémon
(party_index...party_size).each do |idx| (party_index...party_size).each do |idx|