diff --git a/Data/Scripts/001_Technical/002_RubyUtilities.rb b/Data/Scripts/001_Technical/002_RubyUtilities.rb index 8110d606e..6389960b7 100644 --- a/Data/Scripts/001_Technical/002_RubyUtilities.rb +++ b/Data/Scripts/001_Technical/002_RubyUtilities.rb @@ -3,6 +3,10 @@ #=============================================================================== class Object alias full_inspect inspect + + def inspect + return "#<#{self.class}>" + end end #=============================================================================== diff --git a/Data/Scripts/003_Game processing/003_Interpreter.rb b/Data/Scripts/003_Game processing/003_Interpreter.rb index 1673eb8f9..547428d2f 100644 --- a/Data/Scripts/003_Game processing/003_Interpreter.rb +++ b/Data/Scripts/003_Game processing/003_Interpreter.rb @@ -21,8 +21,8 @@ class Interpreter end def inspect - str = self.to_s.chop - str << format(' event ID: %d>', @event_id) + str = super.chop + str << format(' @event_id: %d>', @event_id) return str end diff --git a/Data/Scripts/007_Objects and windows/003_Window.rb b/Data/Scripts/007_Objects and windows/003_Window.rb index 78e901ef7..0bd0a6f01 100644 --- a/Data/Scripts/007_Objects and windows/003_Window.rb +++ b/Data/Scripts/007_Objects and windows/003_Window.rb @@ -74,10 +74,6 @@ class Window attr_reader :openness attr_reader :stretch - def inspect - return self.to_s.chop + ">" - end - def windowskin @_windowskin end diff --git a/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb b/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb index 2163ad049..e0e75bb3f 100644 --- a/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb +++ b/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb @@ -9,7 +9,7 @@ module GameData DATA = {} DATA_FILENAME = "encounters.dat" - extend ClassMethods + extend ClassMethodsSymbols include InstanceMethods # @param map_id [Integer] diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb index 1e468bb56..d2623716b 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb @@ -93,7 +93,7 @@ class Pokemon MAX_MOVES = 4 def inspect - str = self.to_s.chop + str = super.chop str << format(' %s Lv.%s>', @species, @level.to_s || '???') return str end diff --git a/Data/Scripts/015_Trainers and player/001_Trainer.rb b/Data/Scripts/015_Trainers and player/001_Trainer.rb index 180a2e467..15e4bc650 100644 --- a/Data/Scripts/015_Trainers and player/001_Trainer.rb +++ b/Data/Scripts/015_Trainers and player/001_Trainer.rb @@ -9,7 +9,7 @@ class Trainer attr_accessor :party def inspect - str = self.to_s.chop + str = super.chop party_str = @party.map { |p| p.species_data.species }.inspect str << format(' %s @party=%s>', self.full_name, party_str) return str diff --git a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb index c9b86047f..0cc1af5a3 100644 --- a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb +++ b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb @@ -6,7 +6,7 @@ class Player < Trainer attr_reader :accessible_dexes def inspect - str = self.to_s.chop + str = super.chop str << format(' seen: %d, owned: %d>', self.seen_count, self.owned_count) return str end diff --git a/mkxp.json b/mkxp.json index dc681695b..c0d1ae156 100644 --- a/mkxp.json +++ b/mkxp.json @@ -20,6 +20,7 @@ // // "rgssVersion": 1, + // Create a debug context and log // OpenGL debug information to the console // (default: disabled) @@ -180,11 +181,11 @@ "bindingNames": {"c": "Use", "b": "Back", "a": "Action", - "x": "JumpUp", - "y": "JumpDown", - "z": "Special", - "l": "(unused)", - "r": "(unused)"}, + "x": "JumpUp", + "y": "JumpDown", + "z": "Special", + "l": "(unused)", + "r": "(unused)"}, // Allow symlinks for game assets to be followed @@ -304,20 +305,20 @@ // (default: false) // // "JITEnable": false, - + // Determines what level of verbosity to use when // logging JIT events. Starts at 0, which is next // to nothing. Set it higher to see more. // (default: 0) // // "JITVerboseLevel": 0, - + // Determines how many compiled methods that Ruby // will keep in its cache. // (default: 100) // // "JITMaxCache": 100, - + // Determines how many times a function has to be // called before it is compiled. // (default: 10000)