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

Renamed some more global variables

Browse Source
This commit is contained in:
Maruno17
2021-10-20 23:13:30 +01:00
parent e49cd8d498
commit 5e51f702b3
17 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/002_Save data/004_Game_SaveValues.rb
View File

@@ -72,8 +72,8 @@ end
SaveData.register(:map_factory) do
ensure_class :PokemonMapFactory
save_value { $MapFactory }
load_value { |value| $MapFactory = value }
save_value { $map_factory }
load_value { |value| $map_factory = $MapFactory = value }
from_old_format { |old_format| old_format[9] }
end
@@ -121,7 +121,7 @@ SaveData.register(:essentials_version) do
load_in_bootup
ensure_class :String
save_value { Essentials::VERSION }
load_value { |value| $SaveVersion = value }
load_value { |value| $save_engine_version = value }
new_game_value { Essentials::VERSION }
from_old_format { |old_format| old_format[15] }
end
@@ -130,6 +130,6 @@ SaveData.register(:game_version) do
load_in_bootup
ensure_class :String
save_value { Settings::GAME_VERSION }
load_value { |value| $game_version = value }
load_value { |value| $save_game_version = value }
new_game_value { Settings::GAME_VERSION }
end

10
Data/Scripts/003_Game processing/001_StartGame.rb
View File

@@ -46,7 +46,7 @@ module Game
$PokemonTemp.begunNewGame = true
$scene = Scene_Map.new
SaveData.load_new_game_values
$MapFactory = PokemonMapFactory.new($data_system.start_map_id)
$map_factory = PokemonMapFactory.new($data_system.start_map_id)
$game_player.moveto($data_system.start_x, $data_system.start_y)
$game_player.refresh
$PokemonEncounters = PokemonEncounters.new
@@ -70,20 +70,20 @@ module Game
# Loads and validates the map. Called when loading a saved game.
def self.load_map
$game_map = $MapFactory.map
$game_map = $map_factory.map
magic_number_matches = ($game_system.magic_number == $data_system.magic_number)
if !magic_number_matches || $PokemonGlobal.safesave
if pbMapInterpreterRunning?
pbMapInterpreter.setup(nil, 0)
end
begin
$MapFactory.setup($game_map.map_id)
$map_factory.setup($game_map.map_id)
rescue Errno::ENOENT
if $DEBUG
pbMessage(_INTL('Map {1} was not found.', $game_map.map_id))
map = pbWarpToMap
exit unless map
$MapFactory.setup(map[0])
$map_factory.setup(map[0])
$game_player.moveto(map[1], map[2])
else
raise _INTL('The map was not found. The game cannot continue.')
@@ -91,7 +91,7 @@ module Game
end
$game_player.center($game_player.x, $game_player.y)
else
$MapFactory.setMapChanged($game_map.map_id)
$map_factory.setMapChanged($game_map.map_id)
end
if $game_map.events.nil?
raise _INTL('The map is corrupt. The game cannot continue.')

18
Data/Scripts/003_Game processing/002_Scene_Map.rb
View File

@@ -19,18 +19,18 @@ class Scene_Map
@map_renderer = TilemapRenderer.new(Spriteset_Map.viewport)
@spritesetGlobal = Spriteset_Global.new
@spritesets = {}
for map in $MapFactory.maps
for map in $map_factory.maps
@spritesets[map.map_id] = Spriteset_Map.new(map)
end
$MapFactory.setSceneStarted(self)
$map_factory.setSceneStarted(self)
updateSpritesets
end
def createSingleSpriteset(map)
temp = $scene.spriteset.getAnimations
@spritesets[map] = Spriteset_Map.new($MapFactory.maps[map])
@spritesets[map] = Spriteset_Map.new($map_factory.maps[map])
$scene.spriteset.restoreAnimations(temp)
$MapFactory.setSceneStarted(self)
$map_factory.setSceneStarted(self)
updateSpritesets
end
@@ -74,7 +74,7 @@ class Scene_Map
pbBridgeOff
@spritesetGlobal.playersprite.clearShadows
if $game_map.map_id!=$game_temp.player_new_map_id
$MapFactory.setup($game_temp.player_new_map_id)
$map_factory.setup($game_temp.player_new_map_id)
end
$game_player.moveto($game_temp.player_new_x, $game_temp.player_new_y)
case $game_temp.player_new_direction
@@ -132,17 +132,17 @@ class Scene_Map
end
def updateMaps
for map in $MapFactory.maps
for map in $map_factory.maps
map.update
end
$MapFactory.updateMaps(self)
$map_factory.updateMaps(self)
end
def updateSpritesets
@spritesets = {} if !@spritesets
keys = @spritesets.keys.clone
for i in keys
if !$MapFactory.hasMap?(i)
if !$map_factory.hasMap?(i)
@spritesets[i].dispose if @spritesets[i]
@spritesets[i] = nil
@spritesets.delete(i)
@@ -151,7 +151,7 @@ class Scene_Map
end
end
@spritesetGlobal.update
for map in $MapFactory.maps
for map in $map_factory.maps
@spritesets[map.map_id] = Spriteset_Map.new(map) if !@spritesets[map.map_id]
end
pbDayNightTint(@map_renderer)

6
Data/Scripts/003_Game processing/003_Interpreter.rb
View File

@@ -92,7 +92,7 @@ class Interpreter
end
# If this interpreter's map isn't the current map or connected to it,
# forget this interpreter's event ID
if $game_map.map_id != @map_id && !$MapFactory.areConnected?($game_map.map_id, @map_id)
if $game_map.map_id != @map_id && !$map_factory.areConnected?($game_map.map_id, @map_id)
@event_id = 0
end
# Update child interpreter if one exists
@@ -312,8 +312,8 @@ class Interpreter
mapid = @map_id if mapid < 0
old_value = $game_self_switches[[mapid, eventid, switch_name]]
$game_self_switches[[mapid, eventid, switch_name]] = value
if value != old_value && $MapFactory.hasMap?(mapid)
$MapFactory.getMap(mapid, false).need_refresh = true
if value != old_value && $map_factory.hasMap?(mapid)
$map_factory.getMap(mapid, false).need_refresh = true
end
end

2
Data/Scripts/003_Game processing/006_Event_OverworldEvents.rb
View File

@@ -73,7 +73,7 @@ module Events
# Parameters:
# e[0] - Event that just left the tile.
# e[1] - Map ID where the tile is located (not necessarily
# the current map). Use "$MapFactory.getMap(e[1])" to
# the current map). Use "$map_factory.getMap(e[1])" to
# get the Game_Map object corresponding to that map.
# e[2] - X-coordinate of the tile
# e[3] - Y-coordinate of the tile

10
Data/Scripts/004_Game classes/004_Game_Map.rb
View File

@@ -326,7 +326,7 @@ class Game_Map
max_x = (self.width - Graphics.width*1.0/TILE_WIDTH) * REAL_RES_X
@display_x = [0, [@display_x, max_x].min].max
end
$MapFactory.setMapsInRange if $MapFactory
$map_factory.setMapsInRange if $map_factory
end
def display_y=(value)
@@ -336,7 +336,7 @@ class Game_Map
max_y = (self.height - Graphics.height*1.0/TILE_HEIGHT) * REAL_RES_Y
@display_y = [0, [@display_y, max_y].min].max
end
$MapFactory.setMapsInRange if $MapFactory
$map_factory.setMapsInRange if $map_factory
end
def scroll_up(distance)
@@ -397,11 +397,11 @@ class Game_Map
def update
# refresh maps if necessary
if $MapFactory
for i in $MapFactory.maps
if $map_factory
for i in $map_factory.maps
i.refresh if i.need_refresh
end
$MapFactory.setCurrentMap
$map_factory.setCurrentMap
end
# If scrolling
if @scroll_rest>0

4
Data/Scripts/004_Game classes/006_Game_MapFactory.rb
View File

@@ -382,7 +382,7 @@ class PokemonMapFactory
def updateMaps(scene)
updateMapsInternal
$MapFactory.setSceneStarted(scene) if @mapChanged
$map_factory.setSceneStarted(scene) if @mapChanged
end
def updateMapsInternal
@@ -510,7 +510,7 @@ end
#===============================================================================
# Unused
def updateTilesets
maps = $MapFactory.maps
maps = $map_factory.maps
for map in maps
map.updateTileset if map
end

4
Data/Scripts/004_Game classes/007_Game_Character.rb
View File

@@ -203,8 +203,8 @@ class Game_Character
deep_bush = regular_bush = false
xbehind = @x + (@direction == 4 ? 1 : @direction == 6 ? -1 : 0)
ybehind = @y + (@direction == 8 ? 1 : @direction == 2 ? -1 : 0)
this_map = (self.map.valid?(@x, @y)) ? [self.map, @x, @y] : $MapFactory.getNewMap(@x, @y)
behind_map = (self.map.valid?(xbehind, ybehind)) ? [self.map, xbehind, ybehind] : $MapFactory&.getNewMap(xbehind, ybehind)
this_map = (self.map.valid?(@x, @y)) ? [self.map, @x, @y] : $map_factory.getNewMap(@x, @y)
behind_map = (self.map.valid?(xbehind, ybehind)) ? [self.map, xbehind, ybehind] : $map_factory&.getNewMap(xbehind, ybehind)
if this_map[0].deepBush?(this_map[1], this_map[2]) &&
(!behind_map || behind_map[0].deepBush?(behind_map[1], behind_map[2]))
@bush_depth = Game_Map::TILE_HEIGHT

8
Data/Scripts/004_Game classes/009_Game_Player.rb
View File

@@ -160,7 +160,7 @@ class Game_Player < Game_Character
end
def pbTerrainTag(countBridge = false)
return $MapFactory.getTerrainTag(self.map.map_id, @x, @y, countBridge) if $MapFactory
return $map_factory.getTerrainTag(self.map.map_id, @x, @y, countBridge) if $map_factory
return $game_map.terrain_tag(@x, @y, countBridge)
end
@@ -190,7 +190,7 @@ class Game_Player < Game_Character
def pbFacingTerrainTag(dir = nil)
dir = self.direction if !dir
return $MapFactory.getFacingTerrainTag(dir, self) if $MapFactory
return $map_factory.getFacingTerrainTag(dir, self) if $map_factory
facing = pbFacingTile(dir, self)
return $game_map.terrain_tag(facing[1], facing[2])
end
@@ -209,8 +209,8 @@ class Game_Player < Game_Character
# If coordinates are outside of map
return false if !$game_map.validLax?(new_x, new_y)
if !$game_map.valid?(new_x, new_y)
return false if !$MapFactory
return $MapFactory.isPassableFromEdge?(new_x, new_y)
return false if !$map_factory
return $map_factory.isPassableFromEdge?(new_x, new_y)
end
# If debug mode is ON and Ctrl key was pressed
return true if $DEBUG && Input.press?(Input::CTRL)

14
Data/Scripts/004_Game classes/011_Game_Follower.rb
View File

@@ -15,7 +15,7 @@ class Game_Follower < Game_Event
rpg_event.pages[0].list = common_event.list
end
# Create self
super(event_data.original_map_id, rpg_event, $MapFactory.getMap(event_data.current_map_id))
super(event_data.original_map_id, rpg_event, $map_factory.getMap(event_data.current_map_id))
# Modify self
self.character_name = event_data.character_name
self.character_hue = event_data.character_hue
@@ -112,15 +112,15 @@ class Game_Follower < Game_Event
end
def follow_leader(leader, instant = false, leaderIsTrueLeader = true)
maps_connected = $MapFactory.areConnected?(leader.map.map_id, self.map.map_id)
maps_connected = $map_factory.areConnected?(leader.map.map_id, self.map.map_id)
target = nil
# Get the target tile that self wants to move to
if maps_connected
behind_direction = 10 - leader.direction
target = $MapFactory.getFacingTile(behind_direction, leader)
if target && $MapFactory.getTerrainTag(target[0], target[1], target[2]).ledge
target = $map_factory.getFacingTile(behind_direction, leader)
if target && $map_factory.getTerrainTag(target[0], target[1], target[2]).ledge
# Get the tile above the ledge (where the leader jumped from)
target = $MapFactory.getFacingTileFromPos(target[0], target[1], target[2], behind_direction)
target = $map_factory.getFacingTileFromPos(target[0], target[1], target[2], behind_direction)
end
target = [leader.map.map_id, leader.x, leader.y] if !target
else
@@ -129,8 +129,8 @@ class Game_Follower < Game_Event
end
# Move self to the target
if self.map.map_id != target[0]
vector = $MapFactory.getRelativePos(target[0], 0, 0, self.map.map_id, @x, @y)
@map = $MapFactory.getMap(target[0])
vector = $map_factory.getRelativePos(target[0], 0, 0, self.map.map_id, @x, @y)
@map = $map_factory.getMap(target[0])
# NOTE: Can't use moveto because vector is outside the boundaries of the
# map, and moveto doesn't allow setting invalid coordinates.
@x = vector[0]

4
Data/Scripts/004_Game classes/012_Game_FollowerFactory.rb
View File

@@ -179,7 +179,7 @@ class Game_FollowerFactory
!$game_player.move_route_forcing && !$game_temp.message_window_showing &&
!pbMapInterpreterRunning?
# Get position of tile facing the player
facing_tile = $MapFactory.getFacingTile
facing_tile = $map_factory.getFacingTile
# Assumes player is 1x1 tile in size
each_follower do |event, follower|
next if !follower.common_event_id
@@ -241,7 +241,7 @@ class FollowerSprites
@sprites.each { |sprite| sprite.dispose }
@sprites.clear
$PokemonTemp.followers.each_follower do |event, follower|
$MapFactory.maps.each do |map|
$map_factory.maps.each do |map|
map.events[follower.event_id].erase if follower.original_map_id == map.map_id
end
@sprites.push(Sprite_Character.new(@viewport, event))

4
Data/Scripts/006_Map renderer/001_TilemapRenderer.rb
View File

@@ -432,7 +432,7 @@ class TilemapRenderer
# Check for map change
if @current_map_id != $game_map.map_id
if MapFactoryHelper.hasConnections?(@current_map_id)
offsets = $MapFactory.getRelativePos(@current_map_id, 0, 0, $game_map.map_id, 0, 0)
offsets = $map_factory.getRelativePos(@current_map_id, 0, 0, $game_map.map_id, 0, 0)
if offsets
@tile_offset_x -= offsets[0]
@tile_offset_y -= offsets[1]
@@ -554,7 +554,7 @@ class TilemapRenderer
visited[i] = []
@tiles_vertical_count.times { |j| visited[i][j] = false }
end
$MapFactory.maps.each do |map|
$map_factory.maps.each do |map|
# Calculate x/y ranges of tile sprites that represent them
map_display_x = (map.display_x.to_f / Game_Map::X_SUBPIXELS).round
map_display_y = (map.display_y.to_f / Game_Map::Y_SUBPIXELS).round

12
Data/Scripts/012_Overworld/001_Overworld.rb
View File

@@ -129,8 +129,8 @@ end
# Gather soot from soot grass
Events.onStepTakenFieldMovement += proc { |_sender,e|
event = e[0] # Get the event affected by field movement
thistile = $MapFactory.getRealTilePos(event.map.map_id,event.x,event.y)
map = $MapFactory.getMap(thistile[0])
thistile = $map_factory.getRealTilePos(event.map.map_id,event.x,event.y)
map = $map_factory.getMap(thistile[0])
for i in [2, 1, 0]
tile_id = map.data[thistile[1],thistile[2],i]
next if tile_id == nil
@@ -147,7 +147,7 @@ Events.onStepTakenFieldMovement += proc { |_sender, e|
event = e[0] # Get the event affected by field movement
if $scene.is_a?(Scene_Map)
event.each_occupied_tile do |x, y|
if $MapFactory.getTerrainTag(event.map.map_id, x, y, true).shows_grass_rustle
if $map_factory.getTerrainTag(event.map.map_id, x, y, true).shows_grass_rustle
$scene.spriteset.addUserAnimation(Settings::GRASS_ANIMATION_ID, x, y, true, 1)
end
end
@@ -309,7 +309,7 @@ Events.onMapSceneChange += proc { |_sender, e|
#===============================================================================
# NOTE: Assumes the event is 1x1 tile in size. Only returns one tile.
def pbFacingTile(direction=nil,event=nil)
return $MapFactory.getFacingTile(direction,event) if $MapFactory
return $map_factory.getFacingTile(direction,event) if $map_factory
return pbFacingTileRegular(direction,event)
end
@@ -574,8 +574,8 @@ end
def pbTurnTowardEvent(event,otherEvent)
sx = 0
sy = 0
if $MapFactory
relativePos = $MapFactory.getThisAndOtherEventRelativePos(otherEvent,event)
if $map_factory
relativePos = $map_factory.getThisAndOtherEventRelativePos(otherEvent, event)
sx = relativePos[0]
sy = relativePos[1]
else

6
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -385,7 +385,7 @@ Events.onAction += proc { |_sender, _e|
break
end
if surface_map_id &&
$MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive
$map_factory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive
pbSurfacing
end
else
@@ -403,7 +403,7 @@ HiddenMoveHandlers::CanUseMove.add(:DIVE,proc { |move,pkmn,showmsg|
break
end
if !surface_map_id ||
!$MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive
!$map_factory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive
pbMessage(_INTL("Can't use that here.")) if showmsg
next false
end
@@ -741,7 +741,7 @@ def pbStartSurfing
$PokemonEncounters.reset_step_count
$PokemonGlobal.surfing = true
pbUpdateVehicle
$PokemonTemp.surfJump = $MapFactory.getFacingCoords($game_player.x,$game_player.y,$game_player.direction)
$PokemonTemp.surfJump = $map_factory.getFacingCoords($game_player.x, $game_player.y, $game_player.direction)
pbJumpToward
$PokemonTemp.surfJump = nil
$game_player.check_event_trigger_here([1,2])

4
Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb
View File

@@ -35,8 +35,8 @@ class PokemonTilesetScene
pbDisposeSpriteHash(@sprites)
@viewport.dispose
@tilehelper.dispose
if $game_map && $MapFactory
$MapFactory.setup($game_map.map_id)
if $game_map && $map_factory
$map_factory.setup($game_map.map_id)
$game_player.center($game_player.x, $game_player.y)
if $scene.is_a?(Scene_Map)
$scene.disposeSpritesets

2
Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb
View File

@@ -65,7 +65,7 @@ DebugMenuCommands.register("warp", {
$scene.transfer_player
else
pbCancelVehicles
$MapFactory.setup(map[0])
$map_factory.setup(map[0])
$game_player.moveto(map[1], map[2])
$game_player.turn_down
$game_map.update

5
Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb
View File

@@ -17,7 +17,10 @@ module Compiler
['pbCanStore?', '$bag.can_add?'],
['pbStoreItem', '$bag.add'],
['pbStoreAllOrNone', '$bag.add_all'],
['$Trainer', '$player']
['$Trainer', '$player'],
['$SaveVersion', '$save_engine_version'],
['$game_version', '$save_game_version'],
['$MapFactory', '$map_factory']
]
module_function