diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 74c6ff3bb..fcc6c580c 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -2107,6 +2107,7 @@ {"name":"s_node_caustic","order":35,"path":"sprites/s_node_caustic/s_node_caustic.yy",}, {"name":"s_node_chromatic_abarration","order":10,"path":"sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy",}, {"name":"s_node_color_adjust","order":1,"path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",}, + {"name":"s_node_color_data_label","order":27,"path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",}, {"name":"s_node_color_data","order":2,"path":"sprites/s_node_color_data/s_node_color_data.yy",}, {"name":"s_node_color_from_hsv","order":3,"path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",}, {"name":"s_node_color_from_rgb","order":4,"path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index f708202f9..5920ad242 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -2838,6 +2838,7 @@ {"id":{"name":"s_node_checker","path":"sprites/s_node_checker/s_node_checker.yy",},}, {"id":{"name":"s_node_chromatic_abarration","path":"sprites/s_node_chromatic_abarration/s_node_chromatic_abarration.yy",},}, {"id":{"name":"s_node_color_adjust","path":"sprites/s_node_color_adjust/s_node_color_adjust.yy",},}, + {"id":{"name":"s_node_color_data_label","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},}, {"id":{"name":"s_node_color_data","path":"sprites/s_node_color_data/s_node_color_data.yy",},}, {"id":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},}, {"id":{"name":"s_node_color_from_rgb","path":"sprites/s_node_color_from_rgb/s_node_color_from_rgb.yy",},}, diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 03285bf8f..39fc0065a 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -43,7 +43,7 @@ VERSION = 1_17_12_0; SAVE_VERSION = 1_17_10_0; VERSION_STRING = MAC? "1.18.003m" : "1.18"; - BUILD_NUMBER = 1_17_12_0; + BUILD_NUMBER = 1_17_13_0; HOTKEYS = ds_map_create(); HOTKEY_CONTEXT = ds_list_create(); diff --git a/scripts/node_color_data/node_color_data.gml b/scripts/node_color_data/node_color_data.gml index 3e97172b9..d00e7d793 100644 --- a/scripts/node_color_data/node_color_data.gml +++ b/scripts/node_color_data/node_color_data.gml @@ -45,4 +45,25 @@ function Node_Color_Data(_x, _y, _group = noone) : Node_Processor(_x, _y, _group return _n? val / 255 : val; } + + static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { + var bbox = drawGetBbox(xx, yy, _s); + + draw_set_text(f_sdf, fa_right, fa_center, COLORS._main_text); + + for(var i = 0; i < array_length(outputs); i++) { + var val = outputs[i]; + if(!val.isVisible()) continue; + + var _bx1 = bbox.x1 - 8 * _s; + var _bx0 = _bx1 - 20 * _s; + + var _by = val.y; + var _by0 = _by - 10 * _s; + var _by1 = _by + 10 * _s; + + draw_sprite_stretched_points(s_node_color_data_label, i, _bx0, _by0, _bx1, _by1); + } + } + } \ No newline at end of file diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index 7a9f6529b..aea7e51eb 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -1695,6 +1695,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru return removeFrom(); run_in(2, function() /*=>*/ { updateColor(getValue()); }); + var conn = isConnectable(_valueFrom, checkRecur, log); if(conn < 0) return conn; diff --git a/scripts/node_value_bool/node_value_bool.gml b/scripts/node_value_bool/node_value_bool.gml index c284b8ea9..4f1605677 100644 --- a/scripts/node_value_bool/node_value_bool.gml +++ b/scripts/node_value_bool/node_value_bool.gml @@ -8,7 +8,8 @@ function NodeValue_Bool(_name, _node, _value, _tooltip = "") : NodeValue(_name, getValueRecursive(self.__curr_get_val, _time); var val = __curr_get_val[0]; var nod = __curr_get_val[1]; - return bool(val); + + return is_array(val)? array_map(val, function(v) /*=>*/ {return bool(v)}) : bool(val); } static __getAnimValue = function(_time = CURRENT_FRAME) { diff --git a/scripts/panel_collection/panel_collection.gml b/scripts/panel_collection/panel_collection.gml index aec67240e..ec3c9e896 100644 --- a/scripts/panel_collection/panel_collection.gml +++ b/scripts/panel_collection/panel_collection.gml @@ -283,7 +283,7 @@ function Panel_Collection() : PanelContent() constructor { case FILE_TYPE.project : _typ = "Project"; break; } - DRAGGING = { type : _typ, data : _node } + DRAGGING = { type : _typ, data : _node }; } if(!DEMO && mouse_press(mb_right, pFOCUS)) { diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index 4af54b328..09c60d5f2 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -2376,11 +2376,14 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { _sl_x = w / 2 - slider_width / 2; _sl_y = h - toolbar_height - ui(8) - _sl_h; + var _dpd = 12; + // draw_sprite_stretched(THEME.dialog, 0, _sl_x - _dpd, _sl_y - _dpd, slider_width + _dpd * 2, _sl_h + _dpd * 2); draw_sprite_stretched(THEME.ui_panel_bg, 3, _sl_x, _sl_y, slider_width, _sl_h); if(cur != noone) draw_text_add(round(w / 2), round(_sl_y + ui(8)), cur.slide_title); var _hv = false; + var _sn = ui(8); for(var i = 0; i < amo; i++) { var _sx = _ss_x + ui(16) + i * ui(16); @@ -2392,7 +2395,7 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { var slid = struct_try_get(project.slideShow, project.slideShow_keys[i], noone); - if(pHOVER && point_in_circle(mx, my, _sx, _sy, ui(8))) { + if(pHOVER && point_in_rectangle(mx, my, _sx - _sn, _sy - _sn, _sx + _sn, _sy + _sn)) { if(slid) TOOLTIP = slid.slide_title; _hv = true; aa = 1; @@ -2415,6 +2418,35 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { setSlideShow((ind + 1) % amo); } } + + var _dir = filename_name_only(filename_dir(PROJECT.path)); + if(_dir == "Getting started") { + var _spx1 = _sl_x - ui(8); + var _spx0 = _spx1 - ui(40); + + var _spy0 = _sl_y; + var _spy1 = _sl_y + _sl_h; + + var _spw = _spx1 - _spx0; + var _sph = _spy1 - _spy0; + + draw_sprite_stretched(THEME.ui_panel_bg, 3, _spx0, _spy0, _spw, _sph); + + if(point_in_rectangle(mx, my, _spx0, _spy0, _spx1, _spy1)) { + mouse_on_graph = false; + + if(pHOVER && !_hv) { + TOOLTIP = __txt("Splash screen"); + draw_sprite_stretched_add(THEME.ui_panel_bg, 4, _spx0, _spy0, _spw, _sph, COLORS._main_icon, 0.05); + draw_sprite_stretched_add(THEME.ui_panel, 1, _spx0, _spy0, _spw, _sph, c_white, 0.1); + + if(mouse_press(mb_left, pFOCUS)) + dialogCall(o_dialog_splash); + } + } + + draw_sprite_ui(THEME.hamburger_s, 0, _spx0 + _spw / 2, _spy0 + _sph / 2, 1, 1, 0, COLORS._main_icon); + } } function drawContent(panel) { // //// Main Draw diff --git a/scripts/panel_menu/panel_menu.gml b/scripts/panel_menu/panel_menu.gml index daa748bc9..e0afa8162 100644 --- a/scripts/panel_menu/panel_menu.gml +++ b/scripts/panel_menu/panel_menu.gml @@ -668,11 +668,8 @@ function Panel_Menu() : PanelContent() constructor { #endregion #region title - var txt = ""; - if(PROJECT.safeMode) txt += $"[{__txt("SAFE MODE")}] "; - if(PROJECT.readonly) txt += $"[{__txt("READ ONLY")}] "; - txt += PROJECT.path == ""? __txt("Untitled") : filename_name_only(PROJECT.path); + var txt = PROJECT.path == ""? __txt("Untitled") : filename_name_only(PROJECT.path); if(PROJECT.modified) txt += "*"; var tx0, tx1, tcx; @@ -742,12 +739,35 @@ function Panel_Menu() : PanelContent() constructor { var _tcw = string_width(tc); if(hori) { + var _tyc = (ty0 + ty1) / 2; + draw_set_text(f_p0b, fa_left, fa_center, COLORS._main_text); - draw_text_int(tcx - _tcw / 2, (ty0 + ty1) / 2, tc); + draw_text_int(tcx - _tcw / 2, _tyc, tc); if(full_name) { draw_set_color(COLORS._main_text_sub); - draw_text_int(tcx + _tcw / 2, (ty0 + ty1) / 2, ".pxc"); + draw_text_int(tcx + _tcw / 2, _tyc, ".pxc"); + + if(PROJECT.readonly) { + var _rd_lx = tcx - _tcw / 2 - ui(2); + var _rd_ly = _tyc; + var _rd_t = "Read only"; + + draw_set_font(f_p3); + var _rd_w = string_width(_rd_t) + ui(8); + var _rd_h = string_height(_rd_t) + ui(4); + + var _rd_x0 = _rd_lx - _rd_w - ui(8); + var _rd_x1 = _rd_x0 + _rd_w; + + var _rd_y0 = _rd_ly - _rd_h / 2; + var _rd_y1 = _rd_ly + _rd_h / 2; + + draw_sprite_stretched_ext(THEME.s_box_r2, 0, _rd_x0, _rd_y0, _rd_w, _rd_h, COLORS._main_icon); + + draw_set_text(f_p3, fa_center, fa_center, COLORS._main_icon_dark); + draw_text(_rd_x0 + _rd_w / 2, _rd_y0 + _rd_h / 2, _rd_t); + } } } else { @@ -761,6 +781,8 @@ function Panel_Menu() : PanelContent() constructor { } + draw_set_font(f_p0b); + if(IS_PATREON && PREFERENCES.show_supporter_icon) { var _tw = string_width(tc); var _th = string_height(tc); diff --git a/scripts/struct_functions/struct_functions.gml b/scripts/struct_functions/struct_functions.gml index 90520a460..19b4c9c91 100644 --- a/scripts/struct_functions/struct_functions.gml +++ b/scripts/struct_functions/struct_functions.gml @@ -1,7 +1,7 @@ #macro struct_has variable_struct_exists #macro struct_key variable_struct_get_names -function struct_override(original, override) { #region +function struct_override(original, override) { INLINE var args = variable_struct_get_names(override); @@ -14,9 +14,9 @@ function struct_override(original, override) { #region } return original; -} #endregion +} -function struct_override_nested(original, override) { #region +function struct_override_nested(original, override) { INLINE var args = variable_struct_get_names(override); @@ -32,9 +32,9 @@ function struct_override_nested(original, override) { #region } return original; -} #endregion +} -function struct_append(original, append) { #region +function struct_append(original, append) { INLINE var args = variable_struct_get_names(append); @@ -43,22 +43,22 @@ function struct_append(original, append) { #region original[$ args[i]] = append[$ args[i]]; return original; -} #endregion +} -function struct_try_get(struct, key, def = 0) { #region +function struct_try_get(struct, key, def = 0) { INLINE if(struct[$ key] != undefined) return struct[$ key]; key = string_replace_all(key, "_", " "); return struct[$ key] ?? def; -} #endregion +} -function struct_try_override(original, override, key) { #region +function struct_try_override(original, override, key) { INLINE if(!is_struct(original) || !is_struct(override)) return; if(!struct_has(override, key)) return; original[$ key] = override[$ key]; -} #endregion \ No newline at end of file +} \ No newline at end of file diff --git a/sprites/s_node_color_data_label/3a5d6e7f-ad65-41d0-b01d-9dfda05172e5.png b/sprites/s_node_color_data_label/3a5d6e7f-ad65-41d0-b01d-9dfda05172e5.png new file mode 100644 index 000000000..c1dacf102 Binary files /dev/null and b/sprites/s_node_color_data_label/3a5d6e7f-ad65-41d0-b01d-9dfda05172e5.png differ diff --git a/sprites/s_node_color_data_label/58dc9981-2564-43e1-8291-a7fba68ee204.png b/sprites/s_node_color_data_label/58dc9981-2564-43e1-8291-a7fba68ee204.png new file mode 100644 index 000000000..1a151f896 Binary files /dev/null and b/sprites/s_node_color_data_label/58dc9981-2564-43e1-8291-a7fba68ee204.png differ diff --git a/sprites/s_node_color_data_label/59b98d94-c952-4cf9-83da-cabfc17fb921.png b/sprites/s_node_color_data_label/59b98d94-c952-4cf9-83da-cabfc17fb921.png new file mode 100644 index 000000000..e6f2d7547 Binary files /dev/null and b/sprites/s_node_color_data_label/59b98d94-c952-4cf9-83da-cabfc17fb921.png differ diff --git a/sprites/s_node_color_data_label/7197cf10-1f3b-4d1c-9914-b9d4d3052bfd.png b/sprites/s_node_color_data_label/7197cf10-1f3b-4d1c-9914-b9d4d3052bfd.png new file mode 100644 index 000000000..b1a73b3c2 Binary files /dev/null and b/sprites/s_node_color_data_label/7197cf10-1f3b-4d1c-9914-b9d4d3052bfd.png differ diff --git a/sprites/s_node_color_data_label/88613c45-4c75-4e27-aebd-f1a535f13e78.png b/sprites/s_node_color_data_label/88613c45-4c75-4e27-aebd-f1a535f13e78.png new file mode 100644 index 000000000..28b001236 Binary files /dev/null and b/sprites/s_node_color_data_label/88613c45-4c75-4e27-aebd-f1a535f13e78.png differ diff --git a/sprites/s_node_color_data_label/ab5d5e22-7ce4-454c-af7f-65a1f43c22df.png b/sprites/s_node_color_data_label/ab5d5e22-7ce4-454c-af7f-65a1f43c22df.png new file mode 100644 index 000000000..b584c95da Binary files /dev/null and b/sprites/s_node_color_data_label/ab5d5e22-7ce4-454c-af7f-65a1f43c22df.png differ diff --git a/sprites/s_node_color_data_label/d6a11e2b-76fd-4485-ad24-18125a07a217.png b/sprites/s_node_color_data_label/d6a11e2b-76fd-4485-ad24-18125a07a217.png new file mode 100644 index 000000000..5311637e8 Binary files /dev/null and b/sprites/s_node_color_data_label/d6a11e2b-76fd-4485-ad24-18125a07a217.png differ diff --git a/sprites/s_node_color_data_label/e53dabec-f9ee-41f1-b8f6-629c75e8f099.png b/sprites/s_node_color_data_label/e53dabec-f9ee-41f1-b8f6-629c75e8f099.png new file mode 100644 index 000000000..1b7977028 Binary files /dev/null and b/sprites/s_node_color_data_label/e53dabec-f9ee-41f1-b8f6-629c75e8f099.png differ diff --git a/sprites/s_node_color_data_label/layers/3a5d6e7f-ad65-41d0-b01d-9dfda05172e5/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/3a5d6e7f-ad65-41d0-b01d-9dfda05172e5/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..c1dacf102 Binary files /dev/null and b/sprites/s_node_color_data_label/layers/3a5d6e7f-ad65-41d0-b01d-9dfda05172e5/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/layers/58dc9981-2564-43e1-8291-a7fba68ee204/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/58dc9981-2564-43e1-8291-a7fba68ee204/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..1a151f896 Binary files /dev/null and b/sprites/s_node_color_data_label/layers/58dc9981-2564-43e1-8291-a7fba68ee204/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/layers/59b98d94-c952-4cf9-83da-cabfc17fb921/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/59b98d94-c952-4cf9-83da-cabfc17fb921/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..e6f2d7547 Binary files /dev/null and b/sprites/s_node_color_data_label/layers/59b98d94-c952-4cf9-83da-cabfc17fb921/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/layers/7197cf10-1f3b-4d1c-9914-b9d4d3052bfd/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/7197cf10-1f3b-4d1c-9914-b9d4d3052bfd/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..b1a73b3c2 Binary files /dev/null and b/sprites/s_node_color_data_label/layers/7197cf10-1f3b-4d1c-9914-b9d4d3052bfd/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/layers/88613c45-4c75-4e27-aebd-f1a535f13e78/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/88613c45-4c75-4e27-aebd-f1a535f13e78/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..28b001236 Binary files /dev/null and b/sprites/s_node_color_data_label/layers/88613c45-4c75-4e27-aebd-f1a535f13e78/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/layers/ab5d5e22-7ce4-454c-af7f-65a1f43c22df/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/ab5d5e22-7ce4-454c-af7f-65a1f43c22df/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..b584c95da Binary files /dev/null and b/sprites/s_node_color_data_label/layers/ab5d5e22-7ce4-454c-af7f-65a1f43c22df/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/layers/d6a11e2b-76fd-4485-ad24-18125a07a217/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/d6a11e2b-76fd-4485-ad24-18125a07a217/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..5311637e8 Binary files /dev/null and b/sprites/s_node_color_data_label/layers/d6a11e2b-76fd-4485-ad24-18125a07a217/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/layers/e53dabec-f9ee-41f1-b8f6-629c75e8f099/dd7a692f-f222-4474-a737-a00bf5bf4857.png b/sprites/s_node_color_data_label/layers/e53dabec-f9ee-41f1-b8f6-629c75e8f099/dd7a692f-f222-4474-a737-a00bf5bf4857.png new file mode 100644 index 000000000..1b7977028 Binary files /dev/null and b/sprites/s_node_color_data_label/layers/e53dabec-f9ee-41f1-b8f6-629c75e8f099/dd7a692f-f222-4474-a737-a00bf5bf4857.png differ diff --git a/sprites/s_node_color_data_label/s_node_color_data_label.yy b/sprites/s_node_color_data_label/s_node_color_data_label.yy new file mode 100644 index 000000000..d75401772 --- /dev/null +++ b/sprites/s_node_color_data_label/s_node_color_data_label.yy @@ -0,0 +1,137 @@ +{ + "$GMSprite":"", + "%Name":"s_node_color_data_label", + "bboxMode":0, + "bbox_bottom":21, + "bbox_left":2, + "bbox_right":21, + "bbox_top":2, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"d6a11e2b-76fd-4485-ad24-18125a07a217","name":"d6a11e2b-76fd-4485-ad24-18125a07a217","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"88613c45-4c75-4e27-aebd-f1a535f13e78","name":"88613c45-4c75-4e27-aebd-f1a535f13e78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"3a5d6e7f-ad65-41d0-b01d-9dfda05172e5","name":"3a5d6e7f-ad65-41d0-b01d-9dfda05172e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"59b98d94-c952-4cf9-83da-cabfc17fb921","name":"59b98d94-c952-4cf9-83da-cabfc17fb921","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"58dc9981-2564-43e1-8291-a7fba68ee204","name":"58dc9981-2564-43e1-8291-a7fba68ee204","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"7197cf10-1f3b-4d1c-9914-b9d4d3052bfd","name":"7197cf10-1f3b-4d1c-9914-b9d4d3052bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"e53dabec-f9ee-41f1-b8f6-629c75e8f099","name":"e53dabec-f9ee-41f1-b8f6-629c75e8f099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"ab5d5e22-7ce4-454c-af7f-65a1f43c22df","name":"ab5d5e22-7ce4-454c-af7f-65a1f43c22df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":24, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dd7a692f-f222-4474-a737-a00bf5bf4857","blendMode":0,"displayName":"default","isLocked":false,"name":"dd7a692f-f222-4474-a737-a00bf5bf4857","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_color_data_label", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":4, + "enabled":true, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":4, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":4, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":4, + }, + "origin":5, + "parent":{ + "name":"nodes", + "path":"folders/sprites/nodes.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_color_data_label", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":8.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_color_data_label", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6a11e2b-76fd-4485-ad24-18125a07a217","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4351ea1c-5991-48a4-8981-2e059c0b1253","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88613c45-4c75-4e27-aebd-f1a535f13e78","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"332b3a27-44b2-4b32-acad-91c97467d11c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a5d6e7f-ad65-41d0-b01d-9dfda05172e5","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ea11950e-485b-457a-82fc-942ce05e0a99","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59b98d94-c952-4cf9-83da-cabfc17fb921","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c76a024a-c8f7-4c1b-93fe-e16b4a36057a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58dc9981-2564-43e1-8291-a7fba68ee204","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"36a4b655-a2de-443b-9062-e28d51694c4a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7197cf10-1f3b-4d1c-9914-b9d4d3052bfd","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6d066326-5ed4-4e34-b4c3-73084c780050","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e53dabec-f9ee-41f1-b8f6-629c75e8f099","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7b4f9219-29a5-4277-8efc-ba04962be8e6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab5d5e22-7ce4-454c-af7f-65a1f43c22df","path":"sprites/s_node_color_data_label/s_node_color_data_label.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"da8643f7-b53d-4822-bead-66d097f06fbc","IsCreationKey":false,"Key":7.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, + "volume":1.0, + "xorigin":24, + "yorigin":12, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":24, +} \ No newline at end of file diff --git a/sprites/s_node_counter/be90632d-4ff9-4dce-8989-1f2293f02fc3.png b/sprites/s_node_counter/be90632d-4ff9-4dce-8989-1f2293f02fc3.png new file mode 100644 index 000000000..23cb1295a Binary files /dev/null and b/sprites/s_node_counter/be90632d-4ff9-4dce-8989-1f2293f02fc3.png differ diff --git a/sprites/s_node_counter/c47a19ce-2830-495b-b1c9-84e95266d78d.png b/sprites/s_node_counter/c47a19ce-2830-495b-b1c9-84e95266d78d.png deleted file mode 100644 index f9f30918c..000000000 Binary files a/sprites/s_node_counter/c47a19ce-2830-495b-b1c9-84e95266d78d.png and /dev/null differ diff --git a/sprites/s_node_counter/layers/be90632d-4ff9-4dce-8989-1f2293f02fc3/4ae74479-20be-4d65-af79-f6b1fddb5336.png b/sprites/s_node_counter/layers/be90632d-4ff9-4dce-8989-1f2293f02fc3/4ae74479-20be-4d65-af79-f6b1fddb5336.png new file mode 100644 index 000000000..23cb1295a Binary files /dev/null and b/sprites/s_node_counter/layers/be90632d-4ff9-4dce-8989-1f2293f02fc3/4ae74479-20be-4d65-af79-f6b1fddb5336.png 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 deleted file mode 100644 index f9f30918c..000000000 Binary files a/sprites/s_node_counter/layers/c47a19ce-2830-495b-b1c9-84e95266d78d/72f661da-43bb-49b5-8148-f2f2e01dfb29.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 1bf204f09..624dd938c 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":60, - "bbox_left":6, - "bbox_right":57, - "bbox_top":2, + "bbox_bottom":56, + "bbox_left":10, + "bbox_right":53, + "bbox_top":6, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c47a19ce-2830-495b-b1c9-84e95266d78d","name":"c47a19ce-2830-495b-b1c9-84e95266d78d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"","%Name":"be90632d-4ff9-4dce-8989-1f2293f02fc3","name":"be90632d-4ff9-4dce-8989-1f2293f02fc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":64, "HTile":false, "layers":[ - {"$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,}, + {"$GMImageLayer":"","%Name":"4ae74479-20be-4d65-af79-f6b1fddb5336","blendMode":0,"displayName":"default","isLocked":false,"name":"4ae74479-20be-4d65-af79-f6b1fddb5336","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"s_node_counter", "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":"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,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be90632d-4ff9-4dce-8989-1f2293f02fc3","path":"sprites/s_node_counter/s_node_counter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"af5c5a97-24df-4799-822f-3f1c97da5616","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,