Finalised input names, added some more save file conversion code

This commit is contained in:
Maruno17
2021-04-11 15:18:04 +01:00
parent 614e0ed9a2
commit e5a0e3acdd
39 changed files with 145 additions and 106 deletions

View File

@@ -276,7 +276,7 @@ class Game_System
def update
@timer -= 1 if @timer_working and @timer>0
if Input.trigger?(Input::Z) && pbCurrentEventCommentInput(1,"Cut Scene")
if Input.trigger?(Input::SPECIAL) && pbCurrentEventCommentInput(1,"Cut Scene")
event = @map_interpreter.get_character(0)
@map_interpreter.pbSetSelfSwitch(event.id,"A",true)
@map_interpreter.command_end

View File

@@ -62,7 +62,6 @@ class Game_Map
for i in @map.events.keys
@events[i] = Game_Event.new(@map_id, @map.events[i],self)
end
# TODO: These should be moved to Spriteset_Global as we only need one copy of them.
@common_events = {}
for i in 1...$data_common_events.size
@common_events[i] = Game_CommonEvent.new(i)

View File

@@ -32,7 +32,7 @@ class PokemonMapFactory
raise "No maps in save file... (mapIndex=#{@mapIndex})" if @maps.length==0
for i in 0...@maps.length
if @maps[i]
echo("Using next map, may be incorrect (mapIndex=#{@mapIndex}, length=#{@maps.length})")
echoln("Using next map, may be incorrect (mapIndex=#{@mapIndex}, length=#{@maps.length})")
return @maps[i]
end
raise "No maps in save file... (all maps empty; mapIndex=#{@mapIndex})"

View File

@@ -16,7 +16,7 @@ class Game_Character
attr_reader :blend_type
attr_reader :direction
attr_accessor :pattern
attr_reader :pattern_surf
attr_accessor :pattern_surf
attr_accessor :lock_pattern
attr_reader :move_route_forcing
attr_accessor :through

View File

@@ -23,7 +23,7 @@ class Game_Player < Game_Character
return false if $game_temp.in_menu || $game_temp.in_battle ||
@move_route_forcing || $game_temp.message_window_showing ||
pbMapInterpreterRunning?
input = ($PokemonSystem.runstyle == 1) ^ Input.press?(Input::SPECIAL)
input = ($PokemonSystem.runstyle == 1) ^ Input.press?(Input::ACTION)
return input && $PokemonGlobal.runningShoes && !jumping? &&
!$PokemonGlobal.diving && !$PokemonGlobal.surfing &&
!$PokemonGlobal.bicycle && !$game_player.pbTerrainTag.must_walk