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

Added Pokémon properties cannot_store, cannot_release and cannot_trade. Allowed Offspring species property to be edited.

Browse Source
This commit is contained in:
Maruno17
2021-11-08 23:21:20 +00:00
parent 15babcf835
commit 12fd500dbc
9 changed files with 179 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/016_UI/001_Non-interactive UI/001_UI_SplashesAndTitleScreen.rb
View File

@@ -1,6 +1,6 @@
class IntroEventScene < EventScene
# Splash screen images that appear for a few seconds and then disappear.
SPLASH_IMAGES = ['splash1']
SPLASH_IMAGES = ['splash1', 'splash2']
# The main title screen background image.
TITLE_BG_IMAGE = 'title'
TITLE_START_IMAGE = 'start'

2
Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb
View File

@@ -81,7 +81,7 @@ and everyone else who helped out
"mkxp-z" by:
Roza
Based on MKXP by Ancurio et al.
Based on "mkxp" by Ancurio et al.
"RPG Maker XP" by:
Enterbrain

2
Data/Scripts/016_UI/005_UI_Party.rb
View File

@@ -1126,7 +1126,7 @@ class PokemonPartyScreen
eligibility = []
for pkmn in @party
elig = ableProc.call(pkmn)
elig = false if pkmn.egg? || pkmn.shadowPokemon?
elig = false if pkmn.egg? || pkmn.shadowPokemon? || pkmn.cannot_trade
eligibility.push(elig)
annot.push((elig) ? _INTL("ABLE") : _INTL("NOT ABLE"))
end

32
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -1716,6 +1716,10 @@ class PokemonStorageScreen
pbDisplay(_INTL("Please remove the Mail."))
elsif !heldpoke && @storage[box,index].mail
pbDisplay(_INTL("Please remove the Mail."))
elsif heldpoke && heldpoke.cannot_store
pbDisplay(_INTL("{1} refuses to go into storage!", heldpoke.name))
elsif !heldpoke && @storage[box, index].cannot_store
pbDisplay(_INTL("{1} refuses to go into storage!", @storage[box, index].name))
else
loop do
destbox = @scene.pbChooseBox(_INTL("Deposit in which Box?"))
@@ -1766,14 +1770,17 @@ class PokemonStorageScreen
index = selected[1]
if @storage[box,index]
raise _INTL("Position {1},{2} is not empty...",box,index)
end
if box!=-1 && index>=@storage.maxPokemon(box)
pbDisplay("Can't place that there.")
return
end
if box!=-1 && @heldpkmn.mail
pbDisplay("Please remove the mail.")
return
elsif box != -1
if index >= @storage.maxPokemon(box)
pbDisplay("Can't place that there.")
return
elsif @heldpkmn.mail
pbDisplay("Please remove the mail.")
return
elsif @heldpkmn.cannot_store
pbDisplay(_INTL("{1} refuses to go into storage!", @heldpkmn.name))
return
end
end
if Settings::HEAL_STORED_POKEMON && box >= 0
old_ready_evo = @heldpkmn.ready_to_evolve
@@ -1795,7 +1802,11 @@ class PokemonStorageScreen
if !@storage[box,index]
raise _INTL("Position {1},{2} is empty...",box,index)
end
if box==-1 && pbAble?(@storage[box,index]) && pbAbleCount<=1 && !pbAble?(@heldpkmn)
if @heldpkmn.cannot_store && box != -1
pbPlayBuzzerSE
pbDisplay(_INTL("{1} refuses to go into storage!", @heldpkmn.name))
return false
elsif box==-1 && pbAble?(@storage[box,index]) && pbAbleCount<=1 && !pbAble?(@heldpkmn)
pbPlayBuzzerSE
pbDisplay(_INTL("That's your last Pokémon!"))
return false
@@ -1828,6 +1839,9 @@ class PokemonStorageScreen
elsif pokemon.mail
pbDisplay(_INTL("Please remove the mail."))
return false
elsif pokemon.cannot_release
pbDisplay(_INTL("{1} refuses to leave you!", pokemon.name))
return false
end
if box==-1 && pbAbleCount<=1 && pbAble?(pokemon) && !heldpoke
pbPlayBuzzerSE