Update 6.8

Data/Scripts/053_PIF_Hoenn/SecretBases/data/SecretBaseItems.rb

@@ -16,13 +16,14 @@ module SecretBasesData
     behavior: ->(event = nil) {
       #Behavior for PC is handled in SecretBasesController
       #useSecretBasePC
-    }
+    },
+
   )
 
   register_base_item(
     :MANNEQUIN,
     graphics: "Furniture/mannequin.png",
-    real_name: _INTL("Mannequin"),
+    real_name: "Mannequin",
     price: 500,
     behavior: ->(event = nil) {
       useSecretBaseMannequin
@@ -33,25 +34,25 @@ module SecretBasesData
   register_base_item(
     :PLANT,
     graphics: "Furniture/plant.png",
-    real_name: _INTL("Decorative Plant"),
+    real_name: "Decorative Plant",
     price: 500
   )
 
   register_base_item(
     :RED_CHAIR,
     graphics: "Furniture/red_chair.png",
-    real_name: _INTL("Red Chair"),
+    real_name: "Red Chair",
     price: 350,
     trigger: TRIGGER_PLAYER_TOUCH,
     behavior: ->(itemInstance = nil) {
-      sit_on_chair(itemInstance)
+      sit_on_chair_item(itemInstance)
     }
   )
 
   register_base_item(
     :FANCY_CARPET,
     graphics: "Carpets/fancy_carpet.png",
-    real_name: _INTL("Fancy Carpet"),
+    real_name: "Fancy Carpet",
     price: 5000,
     pass_through: true,
     under_player: true
@@ -60,7 +61,7 @@ module SecretBasesData
   register_base_item(
     :FANCY_CARPET_CONNECT,
     graphics: "Carpets/fancy_carpet_connect.png",
-    real_name: _INTL("Fancy Carpet (Connection)"),
+    real_name: "Fancy Carpet (Connection)",
     price: 100,
     pass_through: true,
     under_player: true
@@ -69,7 +70,7 @@ module SecretBasesData
   register_base_item(
     :BOULDER,
     graphics: "Furniture/boulder.png",
-    real_name: _INTL("Boulder"),
+    real_name: "Boulder",
     price: 600,
     under_player: false,
     behavior: ->(itemInstance = nil) {
@@ -85,63 +86,50 @@ module SecretBasesData
   register_base_item(
     :SKITTY_CHAIR_3x3,
     graphics: "skittySet/deco_3x3chair_skitty.png",
-    real_name: _INTL("Skitty Armchair"),
+    real_name: "Skitty Armchair",
     price: 1000,
-    height: 1,
-    width: 3,
     trigger: TRIGGER_PLAYER_TOUCH,
     behavior: ->(itemInstance = nil) {
-      sit_on_chair(itemInstance)
+      sit_on_chair_item(itemInstance)
     },
-    uninteractable_positions: [[-1,0],[1,0]]
+    collision_map: SecretBaseItemCollisionMap.new(
+      [[:x, :i, :x]]
+    ),
   )
 
-  register_base_item(
-    :SKITTY_CHAIR_3x3,
-    graphics: "skittySet/deco_3x3chair_skitty.png",
-    real_name: _INTL("Skitty Armchair"),
-    price: 1000,
-    height: 1,
-    width: 3,
-    trigger: TRIGGER_PLAYER_TOUCH,
-    behavior: ->(itemInstance = nil) {
-      sit_on_chair(itemInstance)
-    },
-    uninteractable_positions: [[-1,0],[1,0]]
-  )
 
   register_base_item(
     :SKITTY_COUCH_3x4,
     graphics: "skittySet/deco_3x4chair_skitty.png",
-    real_name: _INTL("Skitty Couch"),
+    real_name: "Skitty Couch",
     price: 2000,
-    height: 1,
-    width: 4,
     trigger: TRIGGER_PLAYER_TOUCH,
     behavior: ->(itemInstance = nil) {
-      sit_on_chair(itemInstance)
+      sit_on_chair_item(itemInstance)
     },
-    uninteractable_positions: [[-2,0],[2,0]]
+    collision_map: SecretBaseItemCollisionMap.new(
+      [:x, :i, :x]
+    ),
   )
 
   register_base_item(
     :SKITTY_COUCH_3x5,
     graphics: "skittySet/deco_3x5couch_skitty.png",
-    real_name: _INTL("Wide Skitty Couch"),
+    real_name: "Wide Skitty Couch",
     price: 2000,
-    height: 1,
-    width: 5,
+    #height: 1,
+    #width: 5,
     trigger: TRIGGER_PLAYER_TOUCH,
     behavior: ->(itemInstance = nil) {
-      sit_on_chair(itemInstance)
+      sit_on_chair_item(itemInstance)
     },
-    uninteractable_positions: [[-2,0],[2,0]]
+  #uninteractable_positions: [[-2,0],[2,0]]
   )
 
   register_base_item(
     :SKITTY_RUG_3x3,
     graphics: "skittySet/deco_3x3rug_skitty.png",
-    real_name: _INTL("Large Skitty Rug"),
+    real_name: "Large Skitty Rug",
     price: 3000,
     pass_through: true,
     under_player: true
@@ -151,62 +139,62 @@ module SecretBasesData
   register_base_item(
     :ROCK_CHAIR_1x1,
     graphics: "rockSet/deco_1x1chair_rock.png",
-    real_name: _INTL("Rocky Stool"),
+    real_name: "Rocky Stool",
     price: 350,
     trigger: TRIGGER_PLAYER_TOUCH,
     behavior: ->(itemInstance = nil) {
-      sit_on_chair(itemInstance)
+      sit_on_chair_item(itemInstance)
     }
   )
 
   register_base_item(
     :ROCK,
     graphics: "rockSet/deco_1x1deco_rock.png",
-    real_name: _INTL("Rock"),
+    real_name: "Rock",
     price: 50
   )
 
   register_base_item(
     :ROCK_STATUE,
     graphics: "rockSet/deco_1x1statue_rock.png",
-    real_name: _INTL("Rocky Statue"),
+    real_name: "Rocky Statue",
     price: 50
   )
 
   register_base_item(
     :ROCK_WALL,
     graphics: "rockSet/deco_1x2wall_rock.png",
-    real_name: _INTL("Rocky Wall"),
+    real_name: "Rocky Wall",
     price: 50
   )
 
   register_base_item(
     :ROCK_TABLE_2x3,
     graphics: "rockSet/deco_2x3table_rock.png",
-    real_name: _INTL("Large Rocky Table"),
-    width:3,
-    height:2,
+    real_name: "Large Rocky Table",
+    #width:3,
+    #height:2,
     price: 5000
   )
 
   register_base_item(
     :ROCK_CHAIR_3x3,
     graphics: "rockSet/deco_3x3chair_rock.png",
-    real_name: _INTL("Rocky Armchair"),
+    real_name: "Rocky Armchair",
     price: 1000,
-    height: 1,
-    width: 3,
+    #height: 1,
+    #width: 3,
     trigger: TRIGGER_PLAYER_TOUCH,
     behavior: ->(itemInstance = nil) {
-      sit_on_chair(itemInstance)
+      sit_on_chair_item(itemInstance)
     },
-    uninteractable_positions: [[-1,0],[1,0]]
+  #uninteractable_positions: [[-1,0],[1,0]]
   )
 
   register_base_item(
     :ROCK_RUG_1x1,
     graphics: "rockSet/deco_1x1rug_rock.png",
-    real_name: _INTL("Small Rocky Rug"),
+    real_name: "Small Rocky Rug",
     price: 500,
     pass_through: true,
     under_player: true
@@ -215,7 +203,7 @@ module SecretBasesData
   register_base_item(
     :ROCK_RUG_3x3,
     graphics: "rockSet/deco_3x3rug_rock.png",
-    real_name: _INTL("Large Rocky Rug"),
+    real_name: "Large Rocky Rug",
     price: 2000,
     pass_through: true,
     under_player: true