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

Made Zacian/Zamazenta's rusted items unlosable, made bad poison icon be shown again in battle

Browse Source
This commit is contained in:
Maruno17
2022-03-07 23:16:13 +00:00
parent 5d8dad58c4
commit 7f8fa16a52
3 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Data/Scripts/010_Data/002_PBS data/006_Item.rb
View File

@@ -147,44 +147,46 @@ module GameData
return false if species == :ARCEUS && ability != :MULTITYPE return false if species == :ARCEUS && ability != :MULTITYPE
return false if species == :SILVALLY && ability != :RKSSYSTEM return false if species == :SILVALLY && ability != :RKSSYSTEM
combos = { combos = {
:ARCEUS => [:FISTPLATE, :FIGHTINIUMZ, :ARCEUS => [:FISTPLATE, :FIGHTINIUMZ,
:SKYPLATE, :FLYINIUMZ, :SKYPLATE, :FLYINIUMZ,
:TOXICPLATE, :POISONIUMZ, :TOXICPLATE, :POISONIUMZ,
:EARTHPLATE, :GROUNDIUMZ, :EARTHPLATE, :GROUNDIUMZ,
:STONEPLATE, :ROCKIUMZ, :STONEPLATE, :ROCKIUMZ,
:INSECTPLATE, :BUGINIUMZ, :INSECTPLATE, :BUGINIUMZ,
:SPOOKYPLATE, :GHOSTIUMZ, :SPOOKYPLATE, :GHOSTIUMZ,
:IRONPLATE, :STEELIUMZ, :IRONPLATE, :STEELIUMZ,
:FLAMEPLATE, :FIRIUMZ, :FLAMEPLATE, :FIRIUMZ,
:SPLASHPLATE, :WATERIUMZ, :SPLASHPLATE, :WATERIUMZ,
:MEADOWPLATE, :GRASSIUMZ, :MEADOWPLATE, :GRASSIUMZ,
:ZAPPLATE, :ELECTRIUMZ, :ZAPPLATE, :ELECTRIUMZ,
:MINDPLATE, :PSYCHIUMZ, :MINDPLATE, :PSYCHIUMZ,
:ICICLEPLATE, :ICIUMZ, :ICICLEPLATE, :ICIUMZ,
:DRACOPLATE, :DRAGONIUMZ, :DRACOPLATE, :DRAGONIUMZ,
:DREADPLATE, :DARKINIUMZ, :DREADPLATE, :DARKINIUMZ,
:PIXIEPLATE, :FAIRIUMZ], :PIXIEPLATE, :FAIRIUMZ],
:SILVALLY => [:FIGHTINGMEMORY, :SILVALLY => [:FIGHTINGMEMORY,
:FLYINGMEMORY, :FLYINGMEMORY,
:POISONMEMORY, :POISONMEMORY,
:GROUNDMEMORY, :GROUNDMEMORY,
:ROCKMEMORY, :ROCKMEMORY,
:BUGMEMORY, :BUGMEMORY,
:GHOSTMEMORY, :GHOSTMEMORY,
:STEELMEMORY, :STEELMEMORY,
:FIREMEMORY, :FIREMEMORY,
:WATERMEMORY, :WATERMEMORY,
:GRASSMEMORY, :GRASSMEMORY,
:ELECTRICMEMORY, :ELECTRICMEMORY,
:PSYCHICMEMORY, :PSYCHICMEMORY,
:ICEMEMORY, :ICEMEMORY,
:DRAGONMEMORY, :DRAGONMEMORY,
:DARKMEMORY, :DARKMEMORY,
:FAIRYMEMORY], :FAIRYMEMORY],
:GIRATINA => [:GRISEOUSORB], :GIRATINA => [:GRISEOUSORB],
:GENESECT => [:BURNDRIVE, :CHILLDRIVE, :DOUSEDRIVE, :SHOCKDRIVE], :GENESECT => [:BURNDRIVE, :CHILLDRIVE, :DOUSEDRIVE, :SHOCKDRIVE],
:KYOGRE => [:BLUEORB], :KYOGRE => [:BLUEORB],
:GROUDON => [:REDORB] :GROUDON => [:REDORB],
:ZACIAN => [:RUSTEDSWORD],
:ZAMAZENTA => [:RUSTEDSHIELD]
} }
return combos[species]&.include?(@id) return combos[species]&.include?(@id)
end end

2
Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
View File

@@ -251,7 +251,7 @@ class Battle::Scene::PokemonDataBox < SpriteWrapper
# Draw status icon # Draw status icon
if @battler.status != :NONE if @battler.status != :NONE
if @battler.status == :POISON && @battler.statusCount > 0 # Badly poisoned if @battler.status == :POISON && @battler.statusCount > 0 # Badly poisoned
s = GameData::Status.count s = GameData::Status.count - 1
else else
s = GameData::Status.get(@battler.status).icon_position s = GameData::Status.get(@battler.status).icon_position
end end

1
Data/Scripts/020_Debug/003_Debug menus/001_Debug_Menus.rb
View File

@@ -204,6 +204,7 @@ module Battle::DebugMixin
cmdwindow = sprites["cmdwindow"] cmdwindow = sprites["cmdwindow"]
cmdwindow.x = 0 cmdwindow.x = 0
cmdwindow.y = 0 cmdwindow.y = 0
cmdwindow.width = Graphics.width / 2
cmdwindow.height = Graphics.height - sprites["textbox"].height cmdwindow.height = Graphics.height - sprites["textbox"].height
cmdwindow.viewport = viewport cmdwindow.viewport = viewport
cmdwindow.visible = true cmdwindow.visible = true