diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 0f85359ab..3e93bd3da 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -661,6 +661,7 @@ event_inherited(); if(is_instanceof(_node, NodeObject)) { tx = _node.drawList(0, yy, _m[0], _m[1], list_height); + } else { var spr_x = list_height / 2 + ui(44); var spr_y = yy + list_height / 2; diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index 3d4fb3aa2..26b8b386a 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -155,7 +155,7 @@ function NodeObject(_name, _spr, _node, _create, tooltip = "", tags = []) constr static drawList = function(_x, _y, _mx, _my, list_height, _param = {}) { var fav = array_exists(global.FAV_NODES, node); - if(fav) draw_sprite_ui_uniform(THEME.star, 0, ui(32), yy + list_height / 2, 0.7, COLORS._main_accent, 1.); + if(fav) draw_sprite_ui_uniform(THEME.star, 0, ui(32), _y + list_height / 2, 0.7, COLORS._main_accent, 1.); var spr_x = list_height / 2 + ui(44); var spr_y = _y + list_height / 2; diff --git a/scripts/node_shape/node_shape.gml b/scripts/node_shape/node_shape.gml index 735291ff4..bdf67242f 100644 --- a/scripts/node_shape/node_shape.gml +++ b/scripts/node_shape/node_shape.gml @@ -1,7 +1,7 @@ global.node_shape_keys = [ "rectangle", "ellipse", "regular polygon", "star", "arc", "teardrop", "cross", "leaf", "crescent", "donut", "square", "circle", "triangle", "pentagon", "hexagon", "ring", "diamond", "trapezoid", "parallelogram", "heart", - "arrow", "gear", + "arrow", "gear", "squircle", ]; function Node_create_Shape(_x, _y, _group = noone, _param = {}) { diff --git a/sprites/s_node_counter/c47a19ce-2830-495b-b1c9-84e95266d78d.png b/sprites/s_node_counter/c47a19ce-2830-495b-b1c9-84e95266d78d.png new file mode 100644 index 000000000..f9f30918c Binary files /dev/null and b/sprites/s_node_counter/c47a19ce-2830-495b-b1c9-84e95266d78d.png differ diff --git a/sprites/s_node_counter/f62960a2-eb56-4b8f-9bf9-10e552b9002f.png b/sprites/s_node_counter/f62960a2-eb56-4b8f-9bf9-10e552b9002f.png deleted file mode 100644 index e013feafb..000000000 Binary files a/sprites/s_node_counter/f62960a2-eb56-4b8f-9bf9-10e552b9002f.png and /dev/null differ diff --git a/sprites/s_node_counter/layers/c47a19ce-2830-495b-b1c9-84e95266d78d/72f661da-43bb-49b5-8148-f2f2e01dfb29.png b/sprites/s_node_counter/layers/c47a19ce-2830-495b-b1c9-84e95266d78d/72f661da-43bb-49b5-8148-f2f2e01dfb29.png new file mode 100644 index 000000000..f9f30918c Binary files /dev/null and b/sprites/s_node_counter/layers/c47a19ce-2830-495b-b1c9-84e95266d78d/72f661da-43bb-49b5-8148-f2f2e01dfb29.png differ diff --git a/sprites/s_node_counter/layers/f62960a2-eb56-4b8f-9bf9-10e552b9002f/c77b9e52-2e03-42d2-9fc5-000544a4d722.png b/sprites/s_node_counter/layers/f62960a2-eb56-4b8f-9bf9-10e552b9002f/c77b9e52-2e03-42d2-9fc5-000544a4d722.png deleted file mode 100644 index 263ffd7e3..000000000 Binary files a/sprites/s_node_counter/layers/f62960a2-eb56-4b8f-9bf9-10e552b9002f/c77b9e52-2e03-42d2-9fc5-000544a4d722.png and /dev/null differ diff --git a/sprites/s_node_counter/s_node_counter.yy b/sprites/s_node_counter/s_node_counter.yy index 01c8c1981..1bf204f09 100644 --- a/sprites/s_node_counter/s_node_counter.yy +++ b/sprites/s_node_counter/s_node_counter.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_counter", "bboxMode":0, - "bbox_bottom":56, - "bbox_left":10, - "bbox_right":54, - "bbox_top":6, + "bbox_bottom":60, + "bbox_left":6, + "bbox_right":57, + "bbox_top":2, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f62960a2-eb56-4b8f-9bf9-10e552b9002f","name":"f62960a2-eb56-4b8f-9bf9-10e552b9002f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"c47a19ce-2830-495b-b1c9-84e95266d78d","name":"c47a19ce-2830-495b-b1c9-84e95266d78d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"c77b9e52-2e03-42d2-9fc5-000544a4d722","blendMode":0,"displayName":"default","isLocked":false,"name":"c77b9e52-2e03-42d2-9fc5-000544a4d722","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"72f661da-43bb-49b5-8148-f2f2e01dfb29","blendMode":0,"displayName":"default","isLocked":false,"name":"72f661da-43bb-49b5-8148-f2f2e01dfb29","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_counter", "nineSlice":null, @@ -69,14 +69,11 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f62960a2-eb56-4b8f-9bf9-10e552b9002f","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b2f366c-7981-4900-9d7d-8cc10d937e4b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47a19ce-2830-495b-b1c9-84e95266d78d","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2106d7f5-5045-4e10-90e4-648ac8d8c784","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":32, "yorigin":32, diff --git a/sprites/s_node_delay/a26741db-06f1-48a9-9857-4920d5bbf2b4.png b/sprites/s_node_delay/a26741db-06f1-48a9-9857-4920d5bbf2b4.png deleted file mode 100644 index 31a8a8ecd..000000000 Binary files a/sprites/s_node_delay/a26741db-06f1-48a9-9857-4920d5bbf2b4.png and /dev/null differ diff --git a/sprites/s_node_delay/a31e8139-7247-4817-84be-8c6023223319.png b/sprites/s_node_delay/a31e8139-7247-4817-84be-8c6023223319.png new file mode 100644 index 000000000..a9f412562 Binary files /dev/null and b/sprites/s_node_delay/a31e8139-7247-4817-84be-8c6023223319.png differ diff --git a/sprites/s_node_delay/layers/a26741db-06f1-48a9-9857-4920d5bbf2b4/75a3f575-63b9-4b3b-bf0e-f0dae0d10cfa.png b/sprites/s_node_delay/layers/a26741db-06f1-48a9-9857-4920d5bbf2b4/75a3f575-63b9-4b3b-bf0e-f0dae0d10cfa.png deleted file mode 100644 index 0438b1cd4..000000000 Binary files a/sprites/s_node_delay/layers/a26741db-06f1-48a9-9857-4920d5bbf2b4/75a3f575-63b9-4b3b-bf0e-f0dae0d10cfa.png and /dev/null differ diff --git a/sprites/s_node_delay/layers/a31e8139-7247-4817-84be-8c6023223319/7c7c54f8-9323-4e39-84e4-ce3d07b9dec4.png b/sprites/s_node_delay/layers/a31e8139-7247-4817-84be-8c6023223319/7c7c54f8-9323-4e39-84e4-ce3d07b9dec4.png new file mode 100644 index 000000000..a9f412562 Binary files /dev/null and b/sprites/s_node_delay/layers/a31e8139-7247-4817-84be-8c6023223319/7c7c54f8-9323-4e39-84e4-ce3d07b9dec4.png differ diff --git a/sprites/s_node_delay/s_node_delay.yy b/sprites/s_node_delay/s_node_delay.yy index 8f0018494..a307070eb 100644 --- a/sprites/s_node_delay/s_node_delay.yy +++ b/sprites/s_node_delay/s_node_delay.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_delay", "bboxMode":0, - "bbox_bottom":58, - "bbox_left":3, - "bbox_right":60, - "bbox_top":5, + "bbox_bottom":56, + "bbox_left":5, + "bbox_right":58, + "bbox_top":6, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a26741db-06f1-48a9-9857-4920d5bbf2b4","name":"a26741db-06f1-48a9-9857-4920d5bbf2b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"a31e8139-7247-4817-84be-8c6023223319","name":"a31e8139-7247-4817-84be-8c6023223319","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"75a3f575-63b9-4b3b-bf0e-f0dae0d10cfa","blendMode":0,"displayName":"default","isLocked":false,"name":"75a3f575-63b9-4b3b-bf0e-f0dae0d10cfa","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"7c7c54f8-9323-4e39-84e4-ce3d07b9dec4","blendMode":0,"displayName":"default","isLocked":false,"name":"7c7c54f8-9323-4e39-84e4-ce3d07b9dec4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_delay", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a26741db-06f1-48a9-9857-4920d5bbf2b4","path":"sprites/s_node_delay/s_node_delay.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bd3f404-0881-4ca9-9328-21f82fcfe49c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a31e8139-7247-4817-84be-8c6023223319","path":"sprites/s_node_delay/s_node_delay.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b2e00b29-1669-4d59-be24-81e09ac01a26","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_rate_remap/258603da-22bf-4fe0-b7c7-cccabd7a45f1.png b/sprites/s_node_rate_remap/258603da-22bf-4fe0-b7c7-cccabd7a45f1.png new file mode 100644 index 000000000..e05039d5b Binary files /dev/null and b/sprites/s_node_rate_remap/258603da-22bf-4fe0-b7c7-cccabd7a45f1.png differ diff --git a/sprites/s_node_rate_remap/acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1.png b/sprites/s_node_rate_remap/acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1.png deleted file mode 100644 index 11fd94bbc..000000000 Binary files a/sprites/s_node_rate_remap/acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1.png and /dev/null differ diff --git a/sprites/s_node_rate_remap/layers/258603da-22bf-4fe0-b7c7-cccabd7a45f1/a4d1bc1f-c1e4-4bdc-8948-9fb69e5da8cd.png b/sprites/s_node_rate_remap/layers/258603da-22bf-4fe0-b7c7-cccabd7a45f1/a4d1bc1f-c1e4-4bdc-8948-9fb69e5da8cd.png new file mode 100644 index 000000000..e05039d5b Binary files /dev/null and b/sprites/s_node_rate_remap/layers/258603da-22bf-4fe0-b7c7-cccabd7a45f1/a4d1bc1f-c1e4-4bdc-8948-9fb69e5da8cd.png differ diff --git a/sprites/s_node_rate_remap/layers/acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1/c3131a1f-9f99-4129-8e11-3eff1e96b972.png b/sprites/s_node_rate_remap/layers/acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1/c3131a1f-9f99-4129-8e11-3eff1e96b972.png deleted file mode 100644 index a80c0d7e2..000000000 Binary files a/sprites/s_node_rate_remap/layers/acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1/c3131a1f-9f99-4129-8e11-3eff1e96b972.png and /dev/null differ diff --git a/sprites/s_node_rate_remap/s_node_rate_remap.yy b/sprites/s_node_rate_remap/s_node_rate_remap.yy index 09c4c7f00..4ed75be99 100644 --- a/sprites/s_node_rate_remap/s_node_rate_remap.yy +++ b/sprites/s_node_rate_remap/s_node_rate_remap.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_rate_remap", "bboxMode":0, - "bbox_bottom":58, - "bbox_left":3, - "bbox_right":60, - "bbox_top":5, + "bbox_bottom":56, + "bbox_left":6, + "bbox_right":57, + "bbox_top":6, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1","name":"acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"258603da-22bf-4fe0-b7c7-cccabd7a45f1","name":"258603da-22bf-4fe0-b7c7-cccabd7a45f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"c3131a1f-9f99-4129-8e11-3eff1e96b972","blendMode":0,"displayName":"default","isLocked":false,"name":"c3131a1f-9f99-4129-8e11-3eff1e96b972","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"a4d1bc1f-c1e4-4bdc-8948-9fb69e5da8cd","blendMode":0,"displayName":"default","isLocked":false,"name":"a4d1bc1f-c1e4-4bdc-8948-9fb69e5da8cd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_rate_remap", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"acd93f8b-8e04-48f8-ac8e-845ce0d9b1d1","path":"sprites/s_node_rate_remap/s_node_rate_remap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1361911-0b2f-4ad4-86ef-0a1e6da538ea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"258603da-22bf-4fe0-b7c7-cccabd7a45f1","path":"sprites/s_node_rate_remap/s_node_rate_remap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b99b420c-4006-44e6-8567-85c394952f5c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_revert/12c92210-4cca-400a-93d6-758903af833d.png b/sprites/s_node_revert/12c92210-4cca-400a-93d6-758903af833d.png deleted file mode 100644 index 467515170..000000000 Binary files a/sprites/s_node_revert/12c92210-4cca-400a-93d6-758903af833d.png and /dev/null differ diff --git a/sprites/s_node_revert/92e518ff-670b-47bf-87aa-11cabad9f138.png b/sprites/s_node_revert/92e518ff-670b-47bf-87aa-11cabad9f138.png new file mode 100644 index 000000000..d834e0b69 Binary files /dev/null and b/sprites/s_node_revert/92e518ff-670b-47bf-87aa-11cabad9f138.png differ diff --git a/sprites/s_node_revert/layers/12c92210-4cca-400a-93d6-758903af833d/9b707fd4-dc20-4c03-ae26-7e9922a49b92.png b/sprites/s_node_revert/layers/12c92210-4cca-400a-93d6-758903af833d/9b707fd4-dc20-4c03-ae26-7e9922a49b92.png deleted file mode 100644 index 467515170..000000000 Binary files a/sprites/s_node_revert/layers/12c92210-4cca-400a-93d6-758903af833d/9b707fd4-dc20-4c03-ae26-7e9922a49b92.png and /dev/null differ diff --git a/sprites/s_node_revert/layers/92e518ff-670b-47bf-87aa-11cabad9f138/fb38dade-7467-476d-b33c-acde3fcde056.png b/sprites/s_node_revert/layers/92e518ff-670b-47bf-87aa-11cabad9f138/fb38dade-7467-476d-b33c-acde3fcde056.png new file mode 100644 index 000000000..d834e0b69 Binary files /dev/null and b/sprites/s_node_revert/layers/92e518ff-670b-47bf-87aa-11cabad9f138/fb38dade-7467-476d-b33c-acde3fcde056.png differ diff --git a/sprites/s_node_revert/s_node_revert.yy b/sprites/s_node_revert/s_node_revert.yy index a2a6949d7..ac530486a 100644 --- a/sprites/s_node_revert/s_node_revert.yy +++ b/sprites/s_node_revert/s_node_revert.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_revert", "bboxMode":0, - "bbox_bottom":55, - "bbox_left":1, - "bbox_right":62, - "bbox_top":8, + "bbox_bottom":51, + "bbox_left":5, + "bbox_right":58, + "bbox_top":12, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"12c92210-4cca-400a-93d6-758903af833d","name":"12c92210-4cca-400a-93d6-758903af833d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"92e518ff-670b-47bf-87aa-11cabad9f138","name":"92e518ff-670b-47bf-87aa-11cabad9f138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"9b707fd4-dc20-4c03-ae26-7e9922a49b92","blendMode":0,"displayName":"default","isLocked":false,"name":"9b707fd4-dc20-4c03-ae26-7e9922a49b92","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"fb38dade-7467-476d-b33c-acde3fcde056","blendMode":0,"displayName":"default","isLocked":false,"name":"fb38dade-7467-476d-b33c-acde3fcde056","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_revert", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12c92210-4cca-400a-93d6-758903af833d","path":"sprites/s_node_revert/s_node_revert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44165752-d4d8-4cb5-ad87-e318ea5f8279","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92e518ff-670b-47bf-87aa-11cabad9f138","path":"sprites/s_node_revert/s_node_revert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d3e0e4f5-af05-4053-8e17-b2c841ddcf2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/s_node_stagger/73ae5e00-ba02-4b9f-9774-7e3b748c35cd.png b/sprites/s_node_stagger/73ae5e00-ba02-4b9f-9774-7e3b748c35cd.png new file mode 100644 index 000000000..cbca99238 Binary files /dev/null and b/sprites/s_node_stagger/73ae5e00-ba02-4b9f-9774-7e3b748c35cd.png differ diff --git a/sprites/s_node_stagger/b5942e7b-a9f8-4275-90b7-76d09dbb905b.png b/sprites/s_node_stagger/b5942e7b-a9f8-4275-90b7-76d09dbb905b.png deleted file mode 100644 index d00489abe..000000000 Binary files a/sprites/s_node_stagger/b5942e7b-a9f8-4275-90b7-76d09dbb905b.png and /dev/null differ diff --git a/sprites/s_node_stagger/layers/73ae5e00-ba02-4b9f-9774-7e3b748c35cd/bf6e0f55-38d2-4f19-a1eb-c0df7a086cce.png b/sprites/s_node_stagger/layers/73ae5e00-ba02-4b9f-9774-7e3b748c35cd/bf6e0f55-38d2-4f19-a1eb-c0df7a086cce.png new file mode 100644 index 000000000..cbca99238 Binary files /dev/null and b/sprites/s_node_stagger/layers/73ae5e00-ba02-4b9f-9774-7e3b748c35cd/bf6e0f55-38d2-4f19-a1eb-c0df7a086cce.png differ diff --git a/sprites/s_node_stagger/layers/b5942e7b-a9f8-4275-90b7-76d09dbb905b/164b8a9c-adde-4dd4-839b-00dbed78b1e9.png b/sprites/s_node_stagger/layers/b5942e7b-a9f8-4275-90b7-76d09dbb905b/164b8a9c-adde-4dd4-839b-00dbed78b1e9.png deleted file mode 100644 index d0accfbfd..000000000 Binary files a/sprites/s_node_stagger/layers/b5942e7b-a9f8-4275-90b7-76d09dbb905b/164b8a9c-adde-4dd4-839b-00dbed78b1e9.png and /dev/null differ diff --git a/sprites/s_node_stagger/s_node_stagger.yy b/sprites/s_node_stagger/s_node_stagger.yy index 2f1860ca9..26f183181 100644 --- a/sprites/s_node_stagger/s_node_stagger.yy +++ b/sprites/s_node_stagger/s_node_stagger.yy @@ -2,24 +2,24 @@ "$GMSprite":"", "%Name":"s_node_stagger", "bboxMode":0, - "bbox_bottom":59, - "bbox_left":3, - "bbox_right":59, - "bbox_top":3, + "bbox_bottom":58, + "bbox_left":5, + "bbox_right":58, + "bbox_top":5, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b5942e7b-a9f8-4275-90b7-76d09dbb905b","name":"b5942e7b-a9f8-4275-90b7-76d09dbb905b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"73ae5e00-ba02-4b9f-9774-7e3b748c35cd","name":"73ae5e00-ba02-4b9f-9774-7e3b748c35cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"164b8a9c-adde-4dd4-839b-00dbed78b1e9","blendMode":0,"displayName":"default","isLocked":false,"name":"164b8a9c-adde-4dd4-839b-00dbed78b1e9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"bf6e0f55-38d2-4f19-a1eb-c0df7a086cce","blendMode":0,"displayName":"default","isLocked":false,"name":"bf6e0f55-38d2-4f19-a1eb-c0df7a086cce","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_stagger", "nineSlice":null, @@ -69,8 +69,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5942e7b-a9f8-4275-90b7-76d09dbb905b","path":"sprites/s_node_stagger/s_node_stagger.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ef0ddcd-ca17-482e-9c50-ae1d6c41674d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73ae5e00-ba02-4b9f-9774-7e3b748c35cd","path":"sprites/s_node_stagger/s_node_stagger.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c3f3b576-ca89-4521-8e62-65124cbae991","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null,