mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Made Giratina's form use a map_metadata flag "DistortionWorld" instead of a hardcoded array of map numbers
This commit is contained in:
@@ -325,7 +325,7 @@ class Game_Temp
|
|||||||
end
|
end
|
||||||
|
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
# Permanently stores data of dependent events (i.e. in save files).
|
# Permanently stores data of follower events (i.e. in save files).
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
class PokemonGlobalMetadata
|
class PokemonGlobalMetadata
|
||||||
attr_accessor :dependentEvents # Deprecated
|
attr_accessor :dependentEvents # Deprecated
|
||||||
|
|||||||
@@ -259,8 +259,9 @@ MultipleForms.register(:ROTOM, {
|
|||||||
|
|
||||||
MultipleForms.register(:GIRATINA, {
|
MultipleForms.register(:GIRATINA, {
|
||||||
"getForm" => proc { |pkmn|
|
"getForm" => proc { |pkmn|
|
||||||
maps = [49, 50, 51, 72, 73] # Map IDs for Origin Forme
|
next 1 if pkmn.hasItem?(:GRISEOUSORB)
|
||||||
if pkmn.hasItem?(:GRISEOUSORB) || ($game_map && maps.include?($game_map.map_id))
|
if $game_map &&
|
||||||
|
GameData::MapMetadata.get($game_map.map_id)&.has_flag?("DistortionWorld")
|
||||||
next 1
|
next 1
|
||||||
end
|
end
|
||||||
next 0
|
next 0
|
||||||
|
|||||||
@@ -240,7 +240,7 @@ Bicycle = true
|
|||||||
MapPosition = 0,16,10
|
MapPosition = 0,16,10
|
||||||
BattleBack = cave1
|
BattleBack = cave1
|
||||||
Environment = Cave
|
Environment = Cave
|
||||||
Flags = Magnetic
|
Flags = Magnetic,DistortionWorld
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[050] # Rock Cave B1F
|
[050] # Rock Cave B1F
|
||||||
Name = Route 7
|
Name = Route 7
|
||||||
@@ -249,7 +249,7 @@ MapPosition = 0,16,10
|
|||||||
DarkMap = true
|
DarkMap = true
|
||||||
BattleBack = cave3
|
BattleBack = cave3
|
||||||
Environment = Cave
|
Environment = Cave
|
||||||
Flags = Magnetic
|
Flags = Magnetic,DistortionWorld
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[051] # Dungeon
|
[051] # Dungeon
|
||||||
Name = Route 7
|
Name = Route 7
|
||||||
@@ -258,7 +258,7 @@ MapPosition = 0,16,10
|
|||||||
Dungeon = true
|
Dungeon = true
|
||||||
BattleBack = cave2
|
BattleBack = cave2
|
||||||
Environment = Cave
|
Environment = Cave
|
||||||
Flags = Magnetic
|
Flags = Magnetic,DistortionWorld
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[052] # Battle Frontier
|
[052] # Battle Frontier
|
||||||
Name = Battle Frontier
|
Name = Battle Frontier
|
||||||
@@ -375,6 +375,7 @@ ShowArea = true
|
|||||||
Weather = Storm,50
|
Weather = Storm,50
|
||||||
MapPosition = 0,18,17
|
MapPosition = 0,18,17
|
||||||
BattleBack = field
|
BattleBack = field
|
||||||
|
Flags = DistortionWorld
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[073] # Faraday Island
|
[073] # Faraday Island
|
||||||
Name = Faraday Island
|
Name = Faraday Island
|
||||||
@@ -382,6 +383,7 @@ Outdoor = true
|
|||||||
ShowArea = true
|
ShowArea = true
|
||||||
MapPosition = 0,22,16
|
MapPosition = 0,22,16
|
||||||
BattleBack = field
|
BattleBack = field
|
||||||
|
Flags = DistortionWorld
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[074] # Route 6 Cycling Road gate
|
[074] # Route 6 Cycling Road gate
|
||||||
Name = Route 6
|
Name = Route 6
|
||||||
|
|||||||
Reference in New Issue
Block a user