Release 6.9.0

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

@@ -164,6 +164,7 @@ class PokemonTilesetScene
   end
 
   def pbStartScene
+    current_tag = 0
     open_screen
     loop do
       Graphics.update
@@ -182,17 +183,24 @@ class PokemonTilesetScene
         update_cursor_position(0, @visible_height)
       elsif Input.trigger?(Input::ACTION)
         commands = [
-           _INTL("Go to bottom"),
+          _INTL("Change tag"),
+          _INTL("Go to bottom"),
            _INTL("Go to top"),
            _INTL("Change tileset"),
            _INTL("Cancel")
         ]
         case pbShowCommands(nil, commands, -1)
         when 0
-          update_cursor_position(0, 99999)
+          selected = tile_ID_from_coordinates(@x, @y)
+          params = ChooseNumberParams.new
+          params.setRange(0, 99)
+          params.setDefaultValue(@tileset.terrain_tags[selected])
+          current_tag = pbMessageChooseNumber(_INTL("Set the terrain tag."),params)
         when 1
-          update_cursor_position(0, -99999)
+          update_cursor_position(0, 99999)
         when 2
+          update_cursor_position(0, -99999)
+        when 3
           choose_tileset
         end
       elsif Input.trigger?(Input::BACK)
@@ -207,15 +215,20 @@ class PokemonTilesetScene
               $scene.createSpritesets
             end
           end
-          pbMessage(_INTL("To ensure that the changes remain, close and reopen RPG Maker XP."))
+          pbMessage(_INTL("To ensure that the changes remain, close and reopen RPG Maker XP without saving."))
         end
         break if pbConfirmMessage(_INTL("Exit from the editor?"))
       elsif Input.trigger?(Input::USE)
         selected = tile_ID_from_coordinates(@x, @y)
-        params = ChooseNumberParams.new
-        params.setRange(0, 99)
-        params.setDefaultValue(@tileset.terrain_tags[selected])
-        set_terrain_tag_for_tile_ID(selected, pbMessageChooseNumber(_INTL("Set the terrain tag."), params))
+        #set_terrain_tag_for_tile_ID(selected, pbMessageChooseNumber(_INTL("Set the terrain tag."), params))
+
+        selected_tag = @tileset.terrain_tags[selected]
+        if selected_tag == current_tag
+          set_terrain_tag_for_tile_ID(selected, 0)
+        else
+          set_terrain_tag_for_tile_ID(selected, current_tag)
+        end
+
         draw_overlay
       end
     end

Data/Scripts/020_Debug/001_Editor_Utilities.rb

@@ -387,7 +387,7 @@ def pbChooseList(commands, default = 0, cancelValue = -1, sortType = 1)
 end
 
 def pbChooseListWithFilter(commands, default = 0, cancelValue = -1, sortType = 1,
-                           window_x = 0, window_y = 0, filter_default_text = "",
+                           window_x = 0, window_y = 0, filter_default_text = _INTL("Select an option"),
                            width_mode = :filter_text)
   filter_height = 60
   case width_mode

Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb

@@ -114,70 +114,43 @@ def pbAnimName(animation,cmdwin)
 end
 
 def pbAnimList(animations,canvas,animwin)
-  commands=[]
-  for i in 0...animations.length
-    animations[i]=PBAnimation.new if !animations[i]
-    commands[commands.length]="#{i} #{animations[i].name}"
-  end
-  cmdwin=pbListWindow(commands,320)
-  cmdwin.height=416
-  cmdwin.opacity=224
-  cmdwin.index=animations.selected
-  cmdwin.viewport=canvas.viewport
-  helpwindow=Window_UnformattedTextPokemon.newWithSize(
-     _INTL("Enter: Load/rename an animation\nEsc: Cancel"),
-     320,0,320,128,canvas.viewport)
-  maxsizewindow=ControlWindow.new(0,416,320,32*3)
-  maxsizewindow.addSlider(_INTL("Total Animations:"),1,2000,animations.length)
-  maxsizewindow.addButton(_INTL("Resize Animation List"))
-  maxsizewindow.opacity=224
-  maxsizewindow.viewport=canvas.viewport
   loop do
-    Graphics.update
-    Input.update
-    cmdwin.update
-    maxsizewindow.update
-    helpwindow.update
-    if maxsizewindow.changed?(1)
-      newsize=maxsizewindow.value(0)
-      animations.resize(newsize)
-      commands.clear
-      for i in 0...animations.length
-        commands[commands.length]= "#{i} #{animations[i].name}"
-      end
-      cmdwin.commands=commands
-      cmdwin.index=animations.selected
-      next
+    commands=[]
+    for i in 0...animations.length
+      animations[i]=PBAnimation.new if !animations[i]
+      commands.push([i, "#{i} #{animations[i].name}", i])
     end
-    if Input.trigger?(Input::USE) && animations.length>0
-      cmd2=pbShowCommands(helpwindow,[
-         _INTL("Load Animation"),
-         _INTL("Rename"),
-         _INTL("Delete")
-      ],-1)
-      if cmd2==0 # Load Animation
-        canvas.loadAnimation(animations[cmdwin.index])
-        animwin.animbitmap=canvas.animbitmap
-        animations.selected=cmdwin.index
-        break
-      elsif cmd2==1 # Rename
-        pbAnimName(animations[cmdwin.index],cmdwin)
-        cmdwin.refresh
-      elsif cmd2==2 # Delete
-        if pbConfirmMessage(_INTL("Are you sure you want to delete this animation?"))
-          animations[cmdwin.index]=PBAnimation.new
-          cmdwin.commands[cmdwin.index]= "#{cmdwin.index} #{animations[cmdwin.index].name}"
-          cmdwin.refresh
-        end
-      end
-    end
-    if Input.trigger?(Input::BACK)
+    index=pbChooseListWithFilter(commands, animations.selected, -1, 2,
+                                 0, 0, _INTL("Search animation..."), :longest_value)
+    break if !index || index<0   # Cancelled
+    cmd2=pbShowCommands(nil,[
+      _INTL("Load Animation"),
+      _INTL("Rename"),
+      _INTL("Delete"),
+      _INTL("Resize Animation List")
+    ],-1)
+    if cmd2==0 # Load Animation
+      canvas.loadAnimation(animations[index])
+      animwin.animbitmap=canvas.animbitmap
+      animations.selected=index
       break
+    elsif cmd2==1 # Rename
+      dummy=Struct.new(:commands,:index).new([],0)
+      pbAnimName(animations[index],dummy)
+      animations.selected=index
+    elsif cmd2==2 # Delete
+      if pbConfirmMessage(_INTL("Are you sure you want to delete this animation?"))
+        animations[index]=PBAnimation.new
+      end
+      animations.selected=index
+    elsif cmd2==3 # Resize
+      params=ChooseNumberParams.new
+      params.setRange(1,2000)
+      params.setInitialValue(animations.length)
+      animations.resize(pbMessageChooseNumber(_INTL("Total Animations:"),params))
+      animations.selected=[animations.selected,animations.length-1].min
     end
   end
-  helpwindow.dispose
-  maxsizewindow.dispose
-  cmdwin.dispose
 end
 
 ################################################################################

Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb

@@ -941,19 +941,19 @@ DebugMenuCommands.register("terraintags", {
 })
 
 
-# DebugMenuCommands.register("positionsprites", {
-#   "parent"      => "editorsmenu",
-#   "name"        => _INTL("Edit Pokémon Sprite Positions"),
-#   "description" => _INTL("Reposition Pokémon sprites in battle."),
-#   "always_show" => true,
-#   "effect"      => proc {
-#     pbFadeOutIn {
-#       sp = SpritePositioner.new
-#       sps = SpritePositionerScreen.new(sp)
-#       sps.pbStart
-#     }
-#   }
-# })
+DebugMenuCommands.register("positionsprites", {
+  "parent"      => "editorsmenu",
+  "name"        => _INTL("Edit Pokémon Sprite Positions"),
+  "description" => _INTL("Reposition Pokémon sprites in battle."),
+  "always_show" => true,
+  "effect"      => proc {
+    pbFadeOutIn {
+      sp = SpritePositioner.new
+      sps = SpritePositionerScreen.new(sp)
+      sps.pbStart
+    }
+  }
+})
 #
 # DebugMenuCommands.register("autopositionsprites", {
 #   "parent"      => "editorsmenu",