From b3500ab7de1d5d2dacf838bc4c99cacf11a74118 Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 13:47:21 -0600 Subject: [PATCH 01/11] Update allObjectsFIXLATER.js --- assets/scripts/allObjectsFIXLATER.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/scripts/allObjectsFIXLATER.js b/assets/scripts/allObjectsFIXLATER.js index d7c0d7ec..4778df83 100644 --- a/assets/scripts/allObjectsFIXLATER.js +++ b/assets/scripts/allObjectsFIXLATER.js @@ -1739,10 +1739,14 @@ window.allobjects = function() { "default_z_order": 2 }, "144": { - "type": "deco", - "frame": "d_circle_02_001.png", - "gridW": 0, - "gridH": 0, + "type": "hazard", + "frame": "invis_spike_01_glow_001.png", + "gridW": 1, + "gridH": 1, + "spriteW": 30, + "spriteH": 30, + "hitboxScaleX": 0.2, + "hitboxScaleY": 0.4, "default_detail_color_channel": -1, "default_z_layer": 5, "default_z_order": 2 From 9a964d05cb8ca250f4e496e223cb1c58ec83b08c Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 13:53:27 -0600 Subject: [PATCH 02/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index eca442ed..f0502577 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -1756,11 +1756,15 @@ window.allobjects = function() { "default_z_layer": 5, "default_z_order": 2 }, - "144": { - "type": "deco", - "frame": "d_circle_02_001.png", - "gridW": 0, - "gridH": 0, + "144": { + "type": "hazard", + "frame": "invis_spike_01_glow_001.png", + "gridW": 1, + "gridH": 1, + "spriteW": 30, + "spriteH": 30, + "hitboxScaleX": 0.2, + "hitboxScaleY": 0.4, "default_detail_color_channel": -1, "default_z_layer": 5, "default_z_order": 2 From 4841014ca27d85110a178825a1bba4916312f83d Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 14:26:06 -0600 Subject: [PATCH 03/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index f0502577..80623635 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -1770,10 +1770,14 @@ window.allobjects = function() { "default_z_order": 2 }, "145": { - "type": "deco", - "frame": "d_smallBall_05_001.png", - "gridW": 0, - "gridH": 0, + "type": "hazard", + "frame": "invis_triangle_04_001.png", + "gridW": 0.5, + "gridH": 0.5, + "spriteW": 20, + "spriteH": 19, + "hitboxScaleX": 0.2, + "hitboxScaleY": 0.4, "default_detail_color_channel": -1, "default_z_layer": 5, "default_z_order": 2 From 942ec4b68243f31e6cb8ede96ed03e39fc247724 Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 14:32:55 -0600 Subject: [PATCH 04/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index 80623635..1769fa48 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -1771,7 +1771,7 @@ window.allobjects = function() { }, "145": { "type": "hazard", - "frame": "invis_triangle_04_001.png", + "frame": "invis_spike_02_001.png", "gridW": 0.5, "gridH": 0.5, "spriteW": 20, From c089d95442f85ff18ffe4e3e16d999ae3ad5c528 Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 14:34:18 -0600 Subject: [PATCH 05/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index 1769fa48..50201366 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -1771,7 +1771,7 @@ window.allobjects = function() { }, "145": { "type": "hazard", - "frame": "invis_spike_02_001.png", + "frame": "invis_spike_03_001.png", "gridW": 0.5, "gridH": 0.5, "spriteW": 20, From b0acd10e780650cd4e4d3914a5eb7359af65f57f Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 14:46:36 -0600 Subject: [PATCH 06/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index 50201366..4b5d0d52 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -1771,7 +1771,7 @@ window.allobjects = function() { }, "145": { "type": "hazard", - "frame": "invis_spike_03_001.png", + "frame": "invis_spike_04_001.png", "gridW": 0.5, "gridH": 0.5, "spriteW": 20, From 71f9ffbeddd2f92b735cc564b506df066873b665 Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 14:47:47 -0600 Subject: [PATCH 07/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index 4b5d0d52..50201366 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -1771,7 +1771,7 @@ window.allobjects = function() { }, "145": { "type": "hazard", - "frame": "invis_spike_04_001.png", + "frame": "invis_spike_03_001.png", "gridW": 0.5, "gridH": 0.5, "spriteW": 20, From e6a7b79a685b641c02958460d1d9211fd55cd37c Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 14:48:29 -0600 Subject: [PATCH 08/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index 50201366..05f39a76 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -1771,7 +1771,7 @@ window.allobjects = function() { }, "145": { "type": "hazard", - "frame": "invis_spike_03_001.png", + "frame": "invis_spike_03_glow_001.png", "gridW": 0.5, "gridH": 0.5, "spriteW": 20, From bf84d134d98ac64faf894e969ea0ed45fa84e6c2 Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Mon, 22 Jun 2026 14:53:55 -0600 Subject: [PATCH 09/11] Update allObjects.js --- assets/scripts/game/allObjects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index 05f39a76..204ad93b 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -2780,7 +2780,7 @@ window.allobjects = function() { "205": { "can_color": true, "default_base_color_channel": 1004, - "frame": "invis_spike_02_001.png", + "frame": "invis_spike_02_glow_001.png", "glow_frame": "invis_spike_02_glow_001.png", "gridH": 0.46666666865348816, "gridW": 1, From ac52767b86a599795218de6f264092cd51136835 Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Wed, 24 Jun 2026 19:27:24 -0600 Subject: [PATCH 10/11] test test test sahur --- assets/scripts/game/allObjects.js | 37 +++---------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index 204ad93b..e851534b 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -2498,41 +2498,10 @@ window.allobjects = function() { "default_z_order": 1 }, "186": { - "can_color": true, - "children": [ - { - "frame": "blade_01_001.png", - "localDy": 0, - "tint": 65280, - "z": -1 - }, - { - "frame": "blade_01_001.png", - "localDy": 0, - "tint": 65280, - "z": 1 - }, - { - "frame": "blade_01_001.png", - "localDy": 0, - "tint": 65280, - "z": 1 - }, - { - "frame": "blade_01_001.png", - "localDy": 0, - "tint": 65280, - "z": 1 - } - ], - "default_base_color_channel": 1004, + "type": "hazard", "frame": "blade_01_001.png", - "glow_frame": "blade_01_glow_001.png", - "gridH": 1.4333332777023315, - "gridW": 1.4333332777023315, - "spritesheet": "GJ_GameSheet-uhd", - "type": "hazard", - "z": 1, + "gridW": 1, + "gridH": 1, "hitbox_radius": 32.29999923706055, "default_detail_color_channel": -1, "default_z_layer": 5, From 551a27ddc75dabacc98ee89ce4b5d77b4ca89ad5 Mon Sep 17 00:00:00 2001 From: picreatoragain Date: Wed, 24 Jun 2026 19:30:16 -0600 Subject: [PATCH 11/11] revert revert sahur --- assets/scripts/game/allObjects.js | 37 ++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/assets/scripts/game/allObjects.js b/assets/scripts/game/allObjects.js index e851534b..204ad93b 100644 --- a/assets/scripts/game/allObjects.js +++ b/assets/scripts/game/allObjects.js @@ -2498,10 +2498,41 @@ window.allobjects = function() { "default_z_order": 1 }, "186": { - "type": "hazard", + "can_color": true, + "children": [ + { + "frame": "blade_01_001.png", + "localDy": 0, + "tint": 65280, + "z": -1 + }, + { + "frame": "blade_01_001.png", + "localDy": 0, + "tint": 65280, + "z": 1 + }, + { + "frame": "blade_01_001.png", + "localDy": 0, + "tint": 65280, + "z": 1 + }, + { + "frame": "blade_01_001.png", + "localDy": 0, + "tint": 65280, + "z": 1 + } + ], + "default_base_color_channel": 1004, "frame": "blade_01_001.png", - "gridW": 1, - "gridH": 1, + "glow_frame": "blade_01_glow_001.png", + "gridH": 1.4333332777023315, + "gridW": 1.4333332777023315, + "spritesheet": "GJ_GameSheet-uhd", + "type": "hazard", + "z": 1, "hitbox_radius": 32.29999923706055, "default_detail_color_channel": -1, "default_z_layer": 5,