mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 05:34:58 +00:00
Made Zacian/Zamazenta's rusted items unlosable, made bad poison icon be shown again in battle
This commit is contained in:
@@ -184,7 +184,9 @@ module GameData
|
|||||||
: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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user