udpating bounding boxes

jjppof · Feb 13, 2024 · d010788 · d010788
1 parent 1a58d58
commit d010788
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 53 deletions.
diff --git a/assets/maps/cave/cave.json b/assets/maps/cave/cave.json
@@ -1555,11 +1555,11 @@
                         }, 
                         {
                          "x":120,
-                         "y":-80
+                         "y":-64
                         }, 
                         {
                          "x":-8,
-                         "y":-80
+                         "y":-64
                         }, 
                         {
                          "x":-8,
@@ -2624,7 +2624,7 @@
                 }],
          "opacity":1,
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }, 
@@ -2635,36 +2635,36 @@
          "objects":[
                 {
                  "class":"",
-                 "height":456,
+                 "height":480,
                  "id":47,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":480,
-                 "x":16,
+                 "width":496,
+                 "x":8,
                  "y":8
                 }, 
                 {
                  "class":"",
-                 "height":320,
+                 "height":336,
                  "id":48,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":384,
+                 "width":392,
                  "x":600,
-                 "y":112
+                 "y":104
                 }, 
                 {
                  "class":"",
-                 "height":320,
+                 "height":336,
                  "id":49,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":296,
-                 "x":1144,
-                 "y":96
+                 "width":320,
+                 "x":1128,
+                 "y":88
                 }, 
                 {
                  "class":"",
@@ -2673,31 +2673,31 @@
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":128,
+                 "width":136,
                  "x":1568,
                  "y":56
                 }, 
                 {
                  "class":"",
-                 "height":136,
+                 "height":152,
                  "id":51,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":128,
+                 "width":136,
                  "x":1560,
                  "y":296
                 }, 
                 {
                  "class":"",
-                 "height":232,
+                 "height":248,
                  "id":57,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":608,
-                 "x":48,
-                 "y":528
+                 "width":624,
+                 "x":40,
+                 "y":520
                 }],
          "opacity":1,
          "properties":
@@ -2709,7 +2709,7 @@
              "bounding_box":"bool"
             },
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }],

diff --git a/assets/maps/forest/forest.json b/assets/maps/forest/forest.json
@@ -1339,7 +1339,7 @@
              "layer_index":"int"
             },
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }, 
@@ -2237,36 +2237,36 @@
          "objects":[
                 {
                  "class":"",
-                 "height":360,
+                 "height":376,
                  "id":33,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":512,
-                 "x":0,
-                 "y":0
+                 "width":528,
+                 "x":-8,
+                 "y":-8
                 }, 
                 {
                  "class":"",
-                 "height":256,
+                 "height":272,
                  "id":34,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":160,
-                 "x":720,
-                 "y":0
+                 "width":176,
+                 "x":712,
+                 "y":-8
                 }, 
                 {
                  "class":"",
-                 "height":120,
+                 "height":136,
                  "id":35,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":120,
-                 "x":960,
-                 "y":0
+                 "width":136,
+                 "x":952,
+                 "y":-8
                 }],
          "opacity":1,
          "properties":
@@ -2278,7 +2278,7 @@
              "bounding_box":"bool"
             },
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }],

diff --git a/assets/maps/madra/madra_side.json b/assets/maps/madra/madra_side.json
@@ -1651,7 +1651,7 @@
                 }],
          "opacity":1,
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }, 
@@ -2003,7 +2003,7 @@
                 }],
          "opacity":1,
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }, 
@@ -2537,25 +2537,25 @@
          "objects":[
                 {
                  "class":"",
-                 "height":224,
+                 "height":256,
                  "id":34,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":64,
-                 "x":672,
-                 "y":0
+                 "width":96,
+                 "x":656,
+                 "y":-16
                 }, 
                 {
                  "class":"",
-                 "height":480,
+                 "height":512,
                  "id":35,
                  "name":"",
                  "rotation":0,
                  "visible":true,
-                 "width":480,
-                 "x":0,
-                 "y":0
+                 "width":512,
+                 "x":-16,
+                 "y":-16
                 }],
          "opacity":1,
          "properties":
@@ -2567,7 +2567,7 @@
              "bounding_box":"bool"
             },
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }],

diff --git a/base/interactable_objects/RollingPillar.ts b/base/interactable_objects/RollingPillar.ts
@@ -1,12 +1,6 @@
 import {ControllableChar} from "../ControllableChar";
 import {Map} from "../Map";
-import {
-    base_actions,
-    directions,
-    get_centered_pos_in_px,
-    get_distance,
-    get_tile_position,
-} from "../utils";
+import {base_actions, directions, get_centered_pos_in_px, get_distance, get_tile_position} from "../utils";
 import {InteractableObjects} from "./InteractableObjects";
 import * as _ from "lodash";
 import {GameEvent, game_event_origin} from "../game_events/GameEvent";