From f541a13c9bb5b4f96de693e650d7b1b077a0e0ac Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 5 Apr 2021 00:04:18 +0100 Subject: [PATCH] More renaming and rearranging, fixed typo from earlier commit, tweaked splash and title screen code --- .../001_FileTests.rb | 0 .../002_File_Mixins.rb | 0 .../003_Intl_Messages.rb | 0 .../004_PBDebug.rb | 0 .../001_SaveData.rb | 0 .../002_Values.rb | 0 .../003_BuiltinValues.rb | 0 .../004_Conversion.rb | 0 .../005_BuiltinConversions.rb | 0 .../001_StartGame.rb} | 0 .../002_Interpreter.rb} | 0 .../003_Interpreter_Commands.rb} | 0 .../004_Scene_Map.rb} | 0 .../005_Event_Handlers.rb} | 0 .../006_Event_FieldEvents.rb} | 0 .../001_Game_Screen.rb | 0 .../001_Game_Temp.rb | 0 .../002_Game_Switches.rb | 0 .../003_Game_Variables.rb | 0 .../004_Game_SelfSwitches.rb | 0 .../002_Game_System.rb | 0 .../003_Game_Picture.rb | 0 .../004_Game_Map.rb | 0 .../005_Game_MapAutoscroll.rb | 0 .../006_Game_MapFactory.rb | 0 .../007_Game_Character.rb | 0 .../008_Game_Event.rb | 2 +- .../009_Game_Player.rb | 0 .../010_Game_PlayerVisuals.rb | 0 .../011_Game_CommonEvent.rb | 0 .../012_Game_DependentEvents.rb | 0 .../001_Sprite_Picture.rb | 0 .../002_Sprite_Timer.rb | 0 .../003_Sprite_Character.rb | 0 .../004_Sprite_WaterReflection.rb | 0 .../005_Sprite_SurfBase.rb | 0 .../006_Spriteset_Map.rb | 0 .../007_Spriteset_Global.rb | 0 .../008_Sprite_AnimationSprite.rb | 0 .../009_Sprite_DynamicShadows.rb | 0 .../010_ParticleEngine.rb | 0 .../001_Tilemap_XP.rb | 0 .../002_Tilemap_Perspective.rb | 0 .../003_Tilemap_Original.rb | 0 .../004_TilemapLoader.rb | 0 .../005_TileDrawingHelper.rb | 0 .../001_BitmapCache.rb | 0 .../002_MessageConfig.rb | 0 .../003_Window.rb | 0 .../004_SpriteWindow.rb | 0 .../005_SpriteWindow_text.rb | 0 .../006_SpriteWindow_pictures.rb | 0 .../007_SpriteWrapper.rb | 0 .../008_AnimatedBitmap.rb | 0 .../009_Planes.rb | 0 .../010_DrawText.rb | 0 .../011_Messages.rb | 0 .../012_TextEntry.rb | 0 .../013_PictureEx.rb | 0 .../014_Interpolators.rb | 0 ...Field.rb => 001_PokeBattle_ActiveField.rb} | 0 ...State.rb => 002_PokeBattle_DamageState.rb} | 0 ...rb => 009_BallHandlers_PokeBallEffects.rb} | 0 ...eprecated.rb => 002_Trainer_Deprecated.rb} | 0 ...oadAndNew.rb => 002_Trainer_LoadAndNew.rb} | 0 ...ainer_sprite.rb => 003_Trainer_Sprites.rb} | 0 .../014_Trainers/004_Trainer_Deprecated.rb | 124 ++++++++++++++++++ .../001_UI_SplashesAndTitleScreen.rb | 123 ++++++++--------- ...le_Safari.rb => 001_PBattle_SafariZone.rb} | 0 69 files changed, 180 insertions(+), 69 deletions(-) rename Data/Scripts/{007_Files, translation and logs => 001_Technical/001_Files, translation and logs}/001_FileTests.rb (100%) rename Data/Scripts/{007_Files, translation and logs => 001_Technical/001_Files, translation and logs}/002_File_Mixins.rb (100%) rename Data/Scripts/{007_Files, translation and logs => 001_Technical/001_Files, translation and logs}/003_Intl_Messages.rb (100%) rename Data/Scripts/{007_Files, translation and logs => 001_Technical/001_Files, translation and logs}/004_PBDebug.rb (100%) rename Data/Scripts/{001b_Save data => 002_Save data}/001_SaveData.rb (100%) rename Data/Scripts/{001b_Save data => 002_Save data}/002_Values.rb (100%) rename Data/Scripts/{001b_Save data => 002_Save data}/003_BuiltinValues.rb (100%) rename Data/Scripts/{001b_Save data => 002_Save data}/004_Conversion.rb (100%) rename Data/Scripts/{001b_Save data => 002_Save data}/005_BuiltinConversions.rb (100%) rename Data/Scripts/{001c_Game processing/000_StartGame.rb => 003_Game processing/001_StartGame.rb} (100%) rename Data/Scripts/{001c_Game processing/001_Interpreter.rb => 003_Game processing/002_Interpreter.rb} (100%) rename Data/Scripts/{001c_Game processing/001b_Interpreter commands.rb => 003_Game processing/003_Interpreter_Commands.rb} (100%) rename Data/Scripts/{001c_Game processing/002_Scene_Map.rb => 003_Game processing/004_Scene_Map.rb} (100%) rename Data/Scripts/{002b_TriggeredEvents/001_Event_Handlers.rb => 003_Game processing/005_Event_Handlers.rb} (100%) rename Data/Scripts/{002b_TriggeredEvents/002_Event_FieldEvents.rb => 003_Game processing/006_Event_FieldEvents.rb} (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/001_Game_Screen.rb (100%) rename Data/Scripts/{002_Switches and Variables => 004_Game classes/001_Switches and Variables}/001_Game_Temp.rb (100%) rename Data/Scripts/{002_Switches and Variables => 004_Game classes/001_Switches and Variables}/002_Game_Switches.rb (100%) rename Data/Scripts/{002_Switches and Variables => 004_Game classes/001_Switches and Variables}/003_Game_Variables.rb (100%) rename Data/Scripts/{002_Switches and Variables => 004_Game classes/001_Switches and Variables}/004_Game_SelfSwitches.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/002_Game_System.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/003_Game_Picture.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/004_Game_Map.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/005_Game_MapAutoscroll.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/006_Game_MapFactory.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/007_Game_Character.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/008_Game_Event.rb (99%) rename Data/Scripts/{003_Game classes => 004_Game classes}/009_Game_Player.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/010_Game_PlayerVisuals.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/011_Game_CommonEvent.rb (100%) rename Data/Scripts/{003_Game classes => 004_Game classes}/012_Game_DependentEvents.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/001_Sprite_Picture.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/002_Sprite_Timer.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/003_Sprite_Character.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/004_Sprite_WaterReflection.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/005_Sprite_SurfBase.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/006_Spriteset_Map.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/007_Spriteset_Global.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/008_Sprite_AnimationSprite.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/009_Sprite_DynamicShadows.rb (100%) rename Data/Scripts/{004_Sprites => 005_Sprites}/010_ParticleEngine.rb (100%) rename Data/Scripts/{005_Map renderer => 006_Map renderer}/001_Tilemap_XP.rb (100%) rename Data/Scripts/{005_Map renderer => 006_Map renderer}/002_Tilemap_Perspective.rb (100%) rename Data/Scripts/{005_Map renderer => 006_Map renderer}/003_Tilemap_Original.rb (100%) rename Data/Scripts/{005_Map renderer => 006_Map renderer}/004_TilemapLoader.rb (100%) rename Data/Scripts/{005_Map renderer => 006_Map renderer}/005_TileDrawingHelper.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/001_BitmapCache.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/002_MessageConfig.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/003_Window.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/004_SpriteWindow.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/005_SpriteWindow_text.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/006_SpriteWindow_pictures.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/007_SpriteWrapper.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/008_AnimatedBitmap.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/009_Planes.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/010_DrawText.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/011_Messages.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/012_TextEntry.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/013_PictureEx.rb (100%) rename Data/Scripts/{009_Objects and windows => 007_Objects and windows}/014_Interpolators.rb (100%) rename Data/Scripts/012_Battle/{010_PokeBattle_ActiveField.rb => 001_PokeBattle_ActiveField.rb} (100%) rename Data/Scripts/012_Battle/{011_PokeBattle_DamageState.rb => 002_PokeBattle_DamageState.rb} (100%) rename Data/Scripts/012_Battle/{009_PokeBall_CatchEffects.rb => 009_BallHandlers_PokeBallEffects.rb} (100%) rename Data/Scripts/014_Trainers/{001b_Trainer_deprecated.rb => 002_Trainer_Deprecated.rb} (100%) rename Data/Scripts/014_Trainers/{003_Trainer_LoadAndNew.rb => 002_Trainer_LoadAndNew.rb} (100%) rename Data/Scripts/014_Trainers/{004_Trainer_sprite.rb => 003_Trainer_Sprites.rb} (100%) create mode 100644 Data/Scripts/014_Trainers/004_Trainer_Deprecated.rb rename Data/Scripts/019_Other battles/{001_PBattle_Safari.rb => 001_PBattle_SafariZone.rb} (100%) diff --git a/Data/Scripts/007_Files, translation and logs/001_FileTests.rb b/Data/Scripts/001_Technical/001_Files, translation and logs/001_FileTests.rb similarity index 100% rename from Data/Scripts/007_Files, translation and logs/001_FileTests.rb rename to Data/Scripts/001_Technical/001_Files, translation and logs/001_FileTests.rb diff --git a/Data/Scripts/007_Files, translation and logs/002_File_Mixins.rb b/Data/Scripts/001_Technical/001_Files, translation and logs/002_File_Mixins.rb similarity index 100% rename from Data/Scripts/007_Files, translation and logs/002_File_Mixins.rb rename to Data/Scripts/001_Technical/001_Files, translation and logs/002_File_Mixins.rb diff --git a/Data/Scripts/007_Files, translation and logs/003_Intl_Messages.rb b/Data/Scripts/001_Technical/001_Files, translation and logs/003_Intl_Messages.rb similarity index 100% rename from Data/Scripts/007_Files, translation and logs/003_Intl_Messages.rb rename to Data/Scripts/001_Technical/001_Files, translation and logs/003_Intl_Messages.rb diff --git a/Data/Scripts/007_Files, translation and logs/004_PBDebug.rb b/Data/Scripts/001_Technical/001_Files, translation and logs/004_PBDebug.rb similarity index 100% rename from Data/Scripts/007_Files, translation and logs/004_PBDebug.rb rename to Data/Scripts/001_Technical/001_Files, translation and logs/004_PBDebug.rb diff --git a/Data/Scripts/001b_Save data/001_SaveData.rb b/Data/Scripts/002_Save data/001_SaveData.rb similarity index 100% rename from Data/Scripts/001b_Save data/001_SaveData.rb rename to Data/Scripts/002_Save data/001_SaveData.rb diff --git a/Data/Scripts/001b_Save data/002_Values.rb b/Data/Scripts/002_Save data/002_Values.rb similarity index 100% rename from Data/Scripts/001b_Save data/002_Values.rb rename to Data/Scripts/002_Save data/002_Values.rb diff --git a/Data/Scripts/001b_Save data/003_BuiltinValues.rb b/Data/Scripts/002_Save data/003_BuiltinValues.rb similarity index 100% rename from Data/Scripts/001b_Save data/003_BuiltinValues.rb rename to Data/Scripts/002_Save data/003_BuiltinValues.rb diff --git a/Data/Scripts/001b_Save data/004_Conversion.rb b/Data/Scripts/002_Save data/004_Conversion.rb similarity index 100% rename from Data/Scripts/001b_Save data/004_Conversion.rb rename to Data/Scripts/002_Save data/004_Conversion.rb diff --git a/Data/Scripts/001b_Save data/005_BuiltinConversions.rb b/Data/Scripts/002_Save data/005_BuiltinConversions.rb similarity index 100% rename from Data/Scripts/001b_Save data/005_BuiltinConversions.rb rename to Data/Scripts/002_Save data/005_BuiltinConversions.rb diff --git a/Data/Scripts/001c_Game processing/000_StartGame.rb b/Data/Scripts/003_Game processing/001_StartGame.rb similarity index 100% rename from Data/Scripts/001c_Game processing/000_StartGame.rb rename to Data/Scripts/003_Game processing/001_StartGame.rb diff --git a/Data/Scripts/001c_Game processing/001_Interpreter.rb b/Data/Scripts/003_Game processing/002_Interpreter.rb similarity index 100% rename from Data/Scripts/001c_Game processing/001_Interpreter.rb rename to Data/Scripts/003_Game processing/002_Interpreter.rb diff --git a/Data/Scripts/001c_Game processing/001b_Interpreter commands.rb b/Data/Scripts/003_Game processing/003_Interpreter_Commands.rb similarity index 100% rename from Data/Scripts/001c_Game processing/001b_Interpreter commands.rb rename to Data/Scripts/003_Game processing/003_Interpreter_Commands.rb diff --git a/Data/Scripts/001c_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/004_Scene_Map.rb similarity index 100% rename from Data/Scripts/001c_Game processing/002_Scene_Map.rb rename to Data/Scripts/003_Game processing/004_Scene_Map.rb diff --git a/Data/Scripts/002b_TriggeredEvents/001_Event_Handlers.rb b/Data/Scripts/003_Game processing/005_Event_Handlers.rb similarity index 100% rename from Data/Scripts/002b_TriggeredEvents/001_Event_Handlers.rb rename to Data/Scripts/003_Game processing/005_Event_Handlers.rb diff --git a/Data/Scripts/002b_TriggeredEvents/002_Event_FieldEvents.rb b/Data/Scripts/003_Game processing/006_Event_FieldEvents.rb similarity index 100% rename from Data/Scripts/002b_TriggeredEvents/002_Event_FieldEvents.rb rename to Data/Scripts/003_Game processing/006_Event_FieldEvents.rb diff --git a/Data/Scripts/003_Game classes/001_Game_Screen.rb b/Data/Scripts/004_Game classes/001_Game_Screen.rb similarity index 100% rename from Data/Scripts/003_Game classes/001_Game_Screen.rb rename to Data/Scripts/004_Game classes/001_Game_Screen.rb diff --git a/Data/Scripts/002_Switches and Variables/001_Game_Temp.rb b/Data/Scripts/004_Game classes/001_Switches and Variables/001_Game_Temp.rb similarity index 100% rename from Data/Scripts/002_Switches and Variables/001_Game_Temp.rb rename to Data/Scripts/004_Game classes/001_Switches and Variables/001_Game_Temp.rb diff --git a/Data/Scripts/002_Switches and Variables/002_Game_Switches.rb b/Data/Scripts/004_Game classes/001_Switches and Variables/002_Game_Switches.rb similarity index 100% rename from Data/Scripts/002_Switches and Variables/002_Game_Switches.rb rename to Data/Scripts/004_Game classes/001_Switches and Variables/002_Game_Switches.rb diff --git a/Data/Scripts/002_Switches and Variables/003_Game_Variables.rb b/Data/Scripts/004_Game classes/001_Switches and Variables/003_Game_Variables.rb similarity index 100% rename from Data/Scripts/002_Switches and Variables/003_Game_Variables.rb rename to Data/Scripts/004_Game classes/001_Switches and Variables/003_Game_Variables.rb diff --git a/Data/Scripts/002_Switches and Variables/004_Game_SelfSwitches.rb b/Data/Scripts/004_Game classes/001_Switches and Variables/004_Game_SelfSwitches.rb similarity index 100% rename from Data/Scripts/002_Switches and Variables/004_Game_SelfSwitches.rb rename to Data/Scripts/004_Game classes/001_Switches and Variables/004_Game_SelfSwitches.rb diff --git a/Data/Scripts/003_Game classes/002_Game_System.rb b/Data/Scripts/004_Game classes/002_Game_System.rb similarity index 100% rename from Data/Scripts/003_Game classes/002_Game_System.rb rename to Data/Scripts/004_Game classes/002_Game_System.rb diff --git a/Data/Scripts/003_Game classes/003_Game_Picture.rb b/Data/Scripts/004_Game classes/003_Game_Picture.rb similarity index 100% rename from Data/Scripts/003_Game classes/003_Game_Picture.rb rename to Data/Scripts/004_Game classes/003_Game_Picture.rb diff --git a/Data/Scripts/003_Game classes/004_Game_Map.rb b/Data/Scripts/004_Game classes/004_Game_Map.rb similarity index 100% rename from Data/Scripts/003_Game classes/004_Game_Map.rb rename to Data/Scripts/004_Game classes/004_Game_Map.rb diff --git a/Data/Scripts/003_Game classes/005_Game_MapAutoscroll.rb b/Data/Scripts/004_Game classes/005_Game_MapAutoscroll.rb similarity index 100% rename from Data/Scripts/003_Game classes/005_Game_MapAutoscroll.rb rename to Data/Scripts/004_Game classes/005_Game_MapAutoscroll.rb diff --git a/Data/Scripts/003_Game classes/006_Game_MapFactory.rb b/Data/Scripts/004_Game classes/006_Game_MapFactory.rb similarity index 100% rename from Data/Scripts/003_Game classes/006_Game_MapFactory.rb rename to Data/Scripts/004_Game classes/006_Game_MapFactory.rb diff --git a/Data/Scripts/003_Game classes/007_Game_Character.rb b/Data/Scripts/004_Game classes/007_Game_Character.rb similarity index 100% rename from Data/Scripts/003_Game classes/007_Game_Character.rb rename to Data/Scripts/004_Game classes/007_Game_Character.rb diff --git a/Data/Scripts/003_Game classes/008_Game_Event.rb b/Data/Scripts/004_Game classes/008_Game_Event.rb similarity index 99% rename from Data/Scripts/003_Game classes/008_Game_Event.rb rename to Data/Scripts/004_Game classes/008_Game_Event.rb index 3c50e129e..565025883 100644 --- a/Data/Scripts/003_Game classes/008_Game_Event.rb +++ b/Data/Scripts/004_Game classes/008_Game_Event.rb @@ -152,7 +152,7 @@ class Game_Event < Game_Character def check_event_trigger_touch(x, y) return if $game_system.map_interpreter.running? return if @trigger != 2 # Event touch - return if !at_coordinate?($game_player.xm $game_player.y) + return if !at_coordinate?($game_player.x, $game_player.y) return if jumping? || over_trigger? start end diff --git a/Data/Scripts/003_Game classes/009_Game_Player.rb b/Data/Scripts/004_Game classes/009_Game_Player.rb similarity index 100% rename from Data/Scripts/003_Game classes/009_Game_Player.rb rename to Data/Scripts/004_Game classes/009_Game_Player.rb diff --git a/Data/Scripts/003_Game classes/010_Game_PlayerVisuals.rb b/Data/Scripts/004_Game classes/010_Game_PlayerVisuals.rb similarity index 100% rename from Data/Scripts/003_Game classes/010_Game_PlayerVisuals.rb rename to Data/Scripts/004_Game classes/010_Game_PlayerVisuals.rb diff --git a/Data/Scripts/003_Game classes/011_Game_CommonEvent.rb b/Data/Scripts/004_Game classes/011_Game_CommonEvent.rb similarity index 100% rename from Data/Scripts/003_Game classes/011_Game_CommonEvent.rb rename to Data/Scripts/004_Game classes/011_Game_CommonEvent.rb diff --git a/Data/Scripts/003_Game classes/012_Game_DependentEvents.rb b/Data/Scripts/004_Game classes/012_Game_DependentEvents.rb similarity index 100% rename from Data/Scripts/003_Game classes/012_Game_DependentEvents.rb rename to Data/Scripts/004_Game classes/012_Game_DependentEvents.rb diff --git a/Data/Scripts/004_Sprites/001_Sprite_Picture.rb b/Data/Scripts/005_Sprites/001_Sprite_Picture.rb similarity index 100% rename from Data/Scripts/004_Sprites/001_Sprite_Picture.rb rename to Data/Scripts/005_Sprites/001_Sprite_Picture.rb diff --git a/Data/Scripts/004_Sprites/002_Sprite_Timer.rb b/Data/Scripts/005_Sprites/002_Sprite_Timer.rb similarity index 100% rename from Data/Scripts/004_Sprites/002_Sprite_Timer.rb rename to Data/Scripts/005_Sprites/002_Sprite_Timer.rb diff --git a/Data/Scripts/004_Sprites/003_Sprite_Character.rb b/Data/Scripts/005_Sprites/003_Sprite_Character.rb similarity index 100% rename from Data/Scripts/004_Sprites/003_Sprite_Character.rb rename to Data/Scripts/005_Sprites/003_Sprite_Character.rb diff --git a/Data/Scripts/004_Sprites/004_Sprite_WaterReflection.rb b/Data/Scripts/005_Sprites/004_Sprite_WaterReflection.rb similarity index 100% rename from Data/Scripts/004_Sprites/004_Sprite_WaterReflection.rb rename to Data/Scripts/005_Sprites/004_Sprite_WaterReflection.rb diff --git a/Data/Scripts/004_Sprites/005_Sprite_SurfBase.rb b/Data/Scripts/005_Sprites/005_Sprite_SurfBase.rb similarity index 100% rename from Data/Scripts/004_Sprites/005_Sprite_SurfBase.rb rename to Data/Scripts/005_Sprites/005_Sprite_SurfBase.rb diff --git a/Data/Scripts/004_Sprites/006_Spriteset_Map.rb b/Data/Scripts/005_Sprites/006_Spriteset_Map.rb similarity index 100% rename from Data/Scripts/004_Sprites/006_Spriteset_Map.rb rename to Data/Scripts/005_Sprites/006_Spriteset_Map.rb diff --git a/Data/Scripts/004_Sprites/007_Spriteset_Global.rb b/Data/Scripts/005_Sprites/007_Spriteset_Global.rb similarity index 100% rename from Data/Scripts/004_Sprites/007_Spriteset_Global.rb rename to Data/Scripts/005_Sprites/007_Spriteset_Global.rb diff --git a/Data/Scripts/004_Sprites/008_Sprite_AnimationSprite.rb b/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb similarity index 100% rename from Data/Scripts/004_Sprites/008_Sprite_AnimationSprite.rb rename to Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb diff --git a/Data/Scripts/004_Sprites/009_Sprite_DynamicShadows.rb b/Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb similarity index 100% rename from Data/Scripts/004_Sprites/009_Sprite_DynamicShadows.rb rename to Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb diff --git a/Data/Scripts/004_Sprites/010_ParticleEngine.rb b/Data/Scripts/005_Sprites/010_ParticleEngine.rb similarity index 100% rename from Data/Scripts/004_Sprites/010_ParticleEngine.rb rename to Data/Scripts/005_Sprites/010_ParticleEngine.rb diff --git a/Data/Scripts/005_Map renderer/001_Tilemap_XP.rb b/Data/Scripts/006_Map renderer/001_Tilemap_XP.rb similarity index 100% rename from Data/Scripts/005_Map renderer/001_Tilemap_XP.rb rename to Data/Scripts/006_Map renderer/001_Tilemap_XP.rb diff --git a/Data/Scripts/005_Map renderer/002_Tilemap_Perspective.rb b/Data/Scripts/006_Map renderer/002_Tilemap_Perspective.rb similarity index 100% rename from Data/Scripts/005_Map renderer/002_Tilemap_Perspective.rb rename to Data/Scripts/006_Map renderer/002_Tilemap_Perspective.rb diff --git a/Data/Scripts/005_Map renderer/003_Tilemap_Original.rb b/Data/Scripts/006_Map renderer/003_Tilemap_Original.rb similarity index 100% rename from Data/Scripts/005_Map renderer/003_Tilemap_Original.rb rename to Data/Scripts/006_Map renderer/003_Tilemap_Original.rb diff --git a/Data/Scripts/005_Map renderer/004_TilemapLoader.rb b/Data/Scripts/006_Map renderer/004_TilemapLoader.rb similarity index 100% rename from Data/Scripts/005_Map renderer/004_TilemapLoader.rb rename to Data/Scripts/006_Map renderer/004_TilemapLoader.rb diff --git a/Data/Scripts/005_Map renderer/005_TileDrawingHelper.rb b/Data/Scripts/006_Map renderer/005_TileDrawingHelper.rb similarity index 100% rename from Data/Scripts/005_Map renderer/005_TileDrawingHelper.rb rename to Data/Scripts/006_Map renderer/005_TileDrawingHelper.rb diff --git a/Data/Scripts/009_Objects and windows/001_BitmapCache.rb b/Data/Scripts/007_Objects and windows/001_BitmapCache.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/001_BitmapCache.rb rename to Data/Scripts/007_Objects and windows/001_BitmapCache.rb diff --git a/Data/Scripts/009_Objects and windows/002_MessageConfig.rb b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/002_MessageConfig.rb rename to Data/Scripts/007_Objects and windows/002_MessageConfig.rb diff --git a/Data/Scripts/009_Objects and windows/003_Window.rb b/Data/Scripts/007_Objects and windows/003_Window.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/003_Window.rb rename to Data/Scripts/007_Objects and windows/003_Window.rb diff --git a/Data/Scripts/009_Objects and windows/004_SpriteWindow.rb b/Data/Scripts/007_Objects and windows/004_SpriteWindow.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/004_SpriteWindow.rb rename to Data/Scripts/007_Objects and windows/004_SpriteWindow.rb diff --git a/Data/Scripts/009_Objects and windows/005_SpriteWindow_text.rb b/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/005_SpriteWindow_text.rb rename to Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb diff --git a/Data/Scripts/009_Objects and windows/006_SpriteWindow_pictures.rb b/Data/Scripts/007_Objects and windows/006_SpriteWindow_pictures.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/006_SpriteWindow_pictures.rb rename to Data/Scripts/007_Objects and windows/006_SpriteWindow_pictures.rb diff --git a/Data/Scripts/009_Objects and windows/007_SpriteWrapper.rb b/Data/Scripts/007_Objects and windows/007_SpriteWrapper.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/007_SpriteWrapper.rb rename to Data/Scripts/007_Objects and windows/007_SpriteWrapper.rb diff --git a/Data/Scripts/009_Objects and windows/008_AnimatedBitmap.rb b/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/008_AnimatedBitmap.rb rename to Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb diff --git a/Data/Scripts/009_Objects and windows/009_Planes.rb b/Data/Scripts/007_Objects and windows/009_Planes.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/009_Planes.rb rename to Data/Scripts/007_Objects and windows/009_Planes.rb diff --git a/Data/Scripts/009_Objects and windows/010_DrawText.rb b/Data/Scripts/007_Objects and windows/010_DrawText.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/010_DrawText.rb rename to Data/Scripts/007_Objects and windows/010_DrawText.rb diff --git a/Data/Scripts/009_Objects and windows/011_Messages.rb b/Data/Scripts/007_Objects and windows/011_Messages.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/011_Messages.rb rename to Data/Scripts/007_Objects and windows/011_Messages.rb diff --git a/Data/Scripts/009_Objects and windows/012_TextEntry.rb b/Data/Scripts/007_Objects and windows/012_TextEntry.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/012_TextEntry.rb rename to Data/Scripts/007_Objects and windows/012_TextEntry.rb diff --git a/Data/Scripts/009_Objects and windows/013_PictureEx.rb b/Data/Scripts/007_Objects and windows/013_PictureEx.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/013_PictureEx.rb rename to Data/Scripts/007_Objects and windows/013_PictureEx.rb diff --git a/Data/Scripts/009_Objects and windows/014_Interpolators.rb b/Data/Scripts/007_Objects and windows/014_Interpolators.rb similarity index 100% rename from Data/Scripts/009_Objects and windows/014_Interpolators.rb rename to Data/Scripts/007_Objects and windows/014_Interpolators.rb diff --git a/Data/Scripts/012_Battle/010_PokeBattle_ActiveField.rb b/Data/Scripts/012_Battle/001_PokeBattle_ActiveField.rb similarity index 100% rename from Data/Scripts/012_Battle/010_PokeBattle_ActiveField.rb rename to Data/Scripts/012_Battle/001_PokeBattle_ActiveField.rb diff --git a/Data/Scripts/012_Battle/011_PokeBattle_DamageState.rb b/Data/Scripts/012_Battle/002_PokeBattle_DamageState.rb similarity index 100% rename from Data/Scripts/012_Battle/011_PokeBattle_DamageState.rb rename to Data/Scripts/012_Battle/002_PokeBattle_DamageState.rb diff --git a/Data/Scripts/012_Battle/009_PokeBall_CatchEffects.rb b/Data/Scripts/012_Battle/009_BallHandlers_PokeBallEffects.rb similarity index 100% rename from Data/Scripts/012_Battle/009_PokeBall_CatchEffects.rb rename to Data/Scripts/012_Battle/009_BallHandlers_PokeBallEffects.rb diff --git a/Data/Scripts/014_Trainers/001b_Trainer_deprecated.rb b/Data/Scripts/014_Trainers/002_Trainer_Deprecated.rb similarity index 100% rename from Data/Scripts/014_Trainers/001b_Trainer_deprecated.rb rename to Data/Scripts/014_Trainers/002_Trainer_Deprecated.rb diff --git a/Data/Scripts/014_Trainers/003_Trainer_LoadAndNew.rb b/Data/Scripts/014_Trainers/002_Trainer_LoadAndNew.rb similarity index 100% rename from Data/Scripts/014_Trainers/003_Trainer_LoadAndNew.rb rename to Data/Scripts/014_Trainers/002_Trainer_LoadAndNew.rb diff --git a/Data/Scripts/014_Trainers/004_Trainer_sprite.rb b/Data/Scripts/014_Trainers/003_Trainer_Sprites.rb similarity index 100% rename from Data/Scripts/014_Trainers/004_Trainer_sprite.rb rename to Data/Scripts/014_Trainers/003_Trainer_Sprites.rb diff --git a/Data/Scripts/014_Trainers/004_Trainer_Deprecated.rb b/Data/Scripts/014_Trainers/004_Trainer_Deprecated.rb new file mode 100644 index 000000000..99b063fc9 --- /dev/null +++ b/Data/Scripts/014_Trainers/004_Trainer_Deprecated.rb @@ -0,0 +1,124 @@ +#=============================================================================== +# Deprecated +#=============================================================================== +class PlayerTrainer + deprecated_method_alias :fullname, :full_name, removal_in: 'v20' + deprecated_method_alias :publicID, :public_ID, removal_in: 'v20' + deprecated_method_alias :secretID, :secret_ID, removal_in: 'v20' + deprecated_method_alias :getForeignID, :make_foreign_ID, removal_in: 'v20' + deprecated_method_alias :trainerTypeName, :trainer_type_name, removal_in: 'v20' + deprecated_method_alias :moneyEarned, :base_money, removal_in: 'v20' + deprecated_method_alias :skill, :skill_level, removal_in: 'v20' + deprecated_method_alias :skillCode, :skill_code, removal_in: 'v20' + deprecated_method_alias :hasSkillCode, :has_skill_code?, removal_in: 'v20' + deprecated_method_alias :pokemonParty, :pokemon_party, removal_in: 'v20' + deprecated_method_alias :ablePokemonParty, :able_party, removal_in: 'v20' + deprecated_method_alias :partyCount, :party_count, removal_in: 'v20' + deprecated_method_alias :pokemonCount, :pokemon_count, removal_in: 'v20' + deprecated_method_alias :ablePokemonCount, :able_pokemon_count, removal_in: 'v20' + deprecated_method_alias :firstParty, :first_party, removal_in: 'v20' + deprecated_method_alias :firstPokemon, :first_pokemon, removal_in: 'v20' + deprecated_method_alias :firstAblePokemon, :first_able_pokemon, removal_in: 'v20' + deprecated_method_alias :lastParty, :last_party, removal_in: 'v20' + deprecated_method_alias :lastPokemon, :last_pokemon, removal_in: 'v20' + deprecated_method_alias :lastAblePokemon, :last_able_pokemon, removal_in: 'v20' + deprecated_method_alias :formseen, :seen_forms, removal_in: 'v20' + deprecated_method_alias :formlastseen, :last_seen_forms, removal_in: 'v20' + deprecated_method_alias :shadowcaught, :owned_shadow, removal_in: 'v20' + deprecated_method_alias :numbadges, :badge_count, removal_in: 'v20' + deprecated_method_alias :pokedexSeen, :seen_count, removal_in: 'v20' + deprecated_method_alias :pokedexOwned, :owned_count, removal_in: 'v20' + deprecated_method_alias :numFormsSeen, :seen_forms_count, removal_in: 'v20' + deprecated_method_alias :clearPokedex, :clear_pokedex, removal_in: 'v20' + deprecated_method_alias :metaID, :character_ID, removal_in: 'v20' + deprecated_method_alias :mysterygiftaccess, :mystery_gift_unlocked, removal_in: 'v20' + deprecated_method_alias :mysterygift, :mystery_gifts, removal_in: 'v20' + deprecated_method_alias :setSeen, :set_seen, removal_in: 'v20' + deprecated_method_alias :setOwned, :set_owned, removal_in: 'v20' +end + +class PokeBattle_Trainer + attr_reader :trainertype, :name, :id, :metaID, :outfit, :language + attr_reader :party, :badges, :money + attr_reader :seen, :owned, :formseen, :formlastseen, :shadowcaught + attr_reader :pokedex, :pokegear + attr_reader :mysterygiftaccess, :mysterygift + + def self.convert(trainer) + validate trainer => self + ret = PlayerTrainer.new(trainer.name, trainer.trainertype) + ret.id = trainer.id + ret.character_ID = trainer.metaID if trainer.metaID + ret.outfit = trainer.outfit if trainer.outfit + ret.language = trainer.language if trainer.language + trainer.party.each { |p| ret.party.push(PokeBattle_Pokemon.convert(p)) } + ret.badges = trainer.badges.clone + ret.money = trainer.money + trainer.seen.each_with_index { |value, i| ret.set_seen(i) if value } + trainer.owned.each_with_index { |value, i| ret.set_owned(i) if value } + trainer.formseen.each_with_index do |value, i| + ret.seen_forms[GameData::Species.get(i).species] = [value[0].clone, value[1].clone] if value + end + trainer.formlastseen.each_with_index do |value, i| + ret.last_seen_forms[GameData::Species.get(i).species] = value.clone if value + end + if trainer.shadowcaught + trainer.shadowcaught.each_with_index do |value, i| + ret.owned_shadow[GameData::Species.get(i).species] = true if value + end + end + ret.pokedex = trainer.pokedex + ret.pokegear = trainer.pokegear + ret.mystery_gift_unlocked = trainer.mysterygiftaccess if trainer.mysterygiftaccess + ret.mystery_gifts = trainer.mysterygift.clone if trainer.mysterygift + return ret + end +end + +# @deprecated Use {Trainer#remove_pokemon_at_index} instead. This alias is slated to be removed in v20. +def pbRemovePokemonAt(index) + Deprecation.warn_method('pbRemovePokemonAt', 'v20', 'PlayerTrainer#remove_pokemon_at_index') + return $Trainer.remove_pokemon_at_index(index) +end + +# @deprecated Use {Trainer#has_other_able_pokemon?} instead. This alias is slated to be removed in v20. +def pbCheckAble(index) + Deprecation.warn_method('pbCheckAble', 'v20', 'PlayerTrainer#has_other_able_pokemon?') + return $Trainer.has_other_able_pokemon?(index) +end + +# @deprecated Use {Trainer#all_fainted?} instead. This alias is slated to be removed in v20. +def pbAllFainted + Deprecation.warn_method('pbAllFainted', 'v20', 'PlayerTrainer#all_fainted?') + return $Trainer.all_fainted? +end + +# @deprecated Use {Trainer#has_species?} instead. This alias is slated to be removed in v20. +def pbHasSpecies?(species, form = -1) + Deprecation.warn_method('pbHasSpecies?', 'v20', 'PlayerTrainer#has_species?') + return $Trainer.has_species?(species, form) +end + +# @deprecated Use {Trainer#has_fateful_species?} instead. This alias is slated to be removed in v20. +def pbHasFatefulSpecies?(species) + Deprecation.warn_method('pbHasSpecies?', 'v20', 'PlayerTrainer#has_fateful_species?') + return $Trainer.has_fateful_species?(species) +end + +# @deprecated Use {Trainer#has_pokemon_of_type?} instead. This alias is slated to be removed in v20. +def pbHasType?(type) + Deprecation.warn_method('pbHasType?', 'v20', 'PlayerTrainer#has_pokemon_of_type?') + return $Trainer.has_pokemon_of_type?(type) +end + +# @deprecated Use {Trainer#get_pokemon_with_move} instead. This alias is slated to be removed in v20. +def pbCheckMove(move) + Deprecation.warn_method('pbCheckMove', 'v20', 'PlayerTrainer#get_pokemon_with_move') + return $Trainer.get_pokemon_with_move(move) +end + +# @deprecated Use {Trainer#heal_party} instead. This alias is slated to be removed in v20. +def pbHealAll + Deprecation.warn_method('pbHealAll', 'v20', 'PlayerTrainer#heal_party') + $Trainer.heal_party +end diff --git a/Data/Scripts/017_UI/001_Animations/001_UI_SplashesAndTitleScreen.rb b/Data/Scripts/017_UI/001_Animations/001_UI_SplashesAndTitleScreen.rb index c0d681f64..0c4bdfc2e 100644 --- a/Data/Scripts/017_UI/001_Animations/001_UI_SplashesAndTitleScreen.rb +++ b/Data/Scripts/017_UI/001_Animations/001_UI_SplashesAndTitleScreen.rb @@ -1,119 +1,111 @@ class IntroEventScene < EventScene - TICKS_PER_PIC = 40 # 20 ticks per second, so 2 seconds - TICKS_PER_ENTER_FLASH = 40 - FADE_TICKS = 8 + # Splash screen images that appear for a few seconds and then disappear. + SPLASH_IMAGES = ['intro1'] + # The main title screen background image. + TITLE_BG_IMAGE = 'splash' + TITLE_START_IMAGE = 'start' + TITLE_START_IMAGE_X = 0 + TITLE_START_IMAGE_Y = 322 + SECONDS_PER_SPLASH = 2 + TICKS_PER_ENTER_FLASH = 40 # 20 ticks per second + FADE_TICKS = 8 # 20 ticks per second - def initialize(pics,splash,_viewport=nil) - super(nil) - @pics = pics - @splash = splash - @pic = addImage(0,0,"") - @pic.setOpacity(0,0) # set opacity to 0 after waiting 0 frames - @pic2 = addImage(0,0,"") # flashing "Press Enter" picture - @pic2.setOpacity(0,0) + def initialize(viewport = nil) + super(viewport) + @pic = addImage(0, 0, "") + @pic.setOpacity(0, 0) # set opacity to 0 after waiting 0 frames + @pic2 = addImage(0, 0, "") # flashing "Press Enter" picture + @pic2.setOpacity(0, 0) # set opacity to 0 after waiting 0 frames @index = 0 pbBGMPlay($data_system.title_bgm) - openPic(self,nil) + open_splash(self, nil) end - def openPic(_scene,*args) + def open_splash(_scene, *args) onCTrigger.clear - @pic.name = "Graphics/Titles/"+@pics[@index] + @pic.name = "Graphics/Titles/" + SPLASH_IMAGES[@index] # fade to opacity 255 in FADE_TICKS ticks after waiting 0 frames - @pic.moveOpacity(0,FADE_TICKS,255) + @pic.moveOpacity(0, FADE_TICKS, 255) pictureWait - @timer = 0 # reset the timer - onUpdate.set(method(:picUpdate)) # call picUpdate every frame - onCTrigger.set(method(:closePic)) # call closePic when C key is pressed + @timer = 0.0 # reset the timer + onUpdate.set(method(:splash_update)) # called every frame + onCTrigger.set(method(:close_splash)) # called when C key is pressed end - def closePic(scene,args) + def close_splash(scene, args) onUpdate.clear onCTrigger.clear - @pic.moveOpacity(0,FADE_TICKS,0) + @pic.moveOpacity(0, FADE_TICKS, 0) pictureWait @index += 1 # Move to the next picture - if @index>=@pics.length - openSplash(scene,args) + if @index >= SPLASH_IMAGES.length + open_title_screen(scene, args) else - openPic(scene,args) + open_splash(scene, args) end end - def picUpdate(scene,args) - @timer += 1 - if @timer>TICKS_PER_PIC*Graphics.frame_rate/20 - @timer = 0 - closePic(scene,args) # Close the picture - end + def splash_update(scene, args) + @timer += Graphics.delta_s + close_splash(scene, args) if @timer > SECONDS_PER_SPLASH end - def openSplash(_scene,*args) + def open_title_screen(_scene, *args) onUpdate.clear onCTrigger.clear - @pic.name = "Graphics/Titles/"+@splash - @pic.moveOpacity(0,FADE_TICKS,255) - @pic2.name = "Graphics/Titles/start" - @pic2.setXY(0,0,322) - @pic2.setVisible(0,true) - @pic2.moveOpacity(0,FADE_TICKS,255) + @pic.name = "Graphics/Titles/" + TITLE_BG_IMAGE + @pic.moveOpacity(0, FADE_TICKS, 255) + @pic2.name = "Graphics/Titles/" + TITLE_START_IMAGE + @pic2.setXY(0, TITLE_START_IMAGE_X, TITLE_START_IMAGE_Y) + @pic2.setVisible(0, true) + @pic2.moveOpacity(0, FADE_TICKS, 255) pictureWait - onUpdate.set(method(:splashUpdate)) # call splashUpdate every frame - onCTrigger.set(method(:closeSplash)) # call closeSplash when C key is pressed + onUpdate.set(method(:title_screen_update)) # called every frame + onCTrigger.set(method(:close_title_screen)) # called when C key is pressed end - def closeSplash(scene,*args) + def fade_out_title_screen(scene) onUpdate.clear onCTrigger.clear # Play random cry species_keys = GameData::Species::DATA.keys species_data = GameData::Species.get(species_keys[rand(species_keys.length)]) GameData::Species.play_cry_from_species(species_data.species, species_data.form) - @pic.moveXY(0,20,0,0) + @pic.moveXY(0, 20, 0, 0) # Adds 20 ticks (1 second) pause pictureWait # Fade out - @pic.moveOpacity(0,FADE_TICKS,0) + @pic.moveOpacity(0, FADE_TICKS, 0) @pic2.clearProcesses - @pic2.moveOpacity(0,FADE_TICKS,0) + @pic2.moveOpacity(0, FADE_TICKS, 0) pbBGMStop(1.0) pictureWait scene.dispose # Close the scene + end + + def close_title_screen(scene, *args) + fade_out_title_screen(scene) sscene = PokemonLoad_Scene.new sscreen = PokemonLoadScreen.new(sscene) sscreen.pbStartLoadScreen end - def closeSplashDelete(scene,*args) - onUpdate.clear - onCTrigger.clear - # Play random cry - species_keys = GameData::Species::DATA.keys - species_data = GameData::Species.get(species_keys[rand(species_keys.length)]) - GameData::Species.play_cry_from_species(species_data.species, species_data.form) - @pic.moveXY(0,20,0,0) - pictureWait - # Fade out - @pic.moveOpacity(0,FADE_TICKS,0) - @pic2.clearProcesses - @pic2.moveOpacity(0,FADE_TICKS,0) - pbBGMStop(1.0) - pictureWait - scene.dispose # Close the scene + def close_title_screen_delete(scene, *args) + fade_out_title_screen(scene) sscene = PokemonLoad_Scene.new sscreen = PokemonLoadScreen.new(sscene) sscreen.pbStartDeleteScreen end - def splashUpdate(scene,args) + def title_screen_update(scene, args) # Flashing of "Press Enter" picture if !@pic2.running? - @pic2.moveOpacity(TICKS_PER_ENTER_FLASH*2/10,TICKS_PER_ENTER_FLASH*4/10,0) - @pic2.moveOpacity(TICKS_PER_ENTER_FLASH*6/10,TICKS_PER_ENTER_FLASH*4/10,255) + @pic2.moveOpacity(TICKS_PER_ENTER_FLASH * 2 / 10, TICKS_PER_ENTER_FLASH * 4 / 10, 0) + @pic2.moveOpacity(TICKS_PER_ENTER_FLASH * 6 / 10, TICKS_PER_ENTER_FLASH * 4 / 10, 255) end if Input.press?(Input::DOWN) && Input.press?(Input::BACK) && Input.press?(Input::CTRL) - closeSplashDelete(scene,args) + close_title_screen_delete(scene, args) end end end @@ -121,14 +113,9 @@ end class Scene_Intro - # Splash screen images that appear for a few seconds and then disappear. - INTRO_SPLASHES = ['intro1'] - # The main title screen background image. - TITLE_SCREEN = 'splash' - def main Graphics.transition(0) - @eventscene = IntroEventScene.new(INTRO_SPLASHES, TITLE_SCREEN) + @eventscene = IntroEventScene.new @eventscene.main Graphics.freeze end diff --git a/Data/Scripts/019_Other battles/001_PBattle_Safari.rb b/Data/Scripts/019_Other battles/001_PBattle_SafariZone.rb similarity index 100% rename from Data/Scripts/019_Other battles/001_PBattle_Safari.rb rename to Data/Scripts/019_Other battles/001_PBattle_SafariZone.rb