diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index e5246c73e2..9f2a8e2d9e 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -115,6 +115,8 @@ "IncludedFiles": [ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"traits.json","CopyToMask":-1,"filePath":"datafiles/data",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"custom_icons_help.txt","CopyToMask":153157610357391598,"filePath":"datafiles/icons",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"custom1.png","CopyToMask":-1,"filePath":"datafiles/icons",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"custom2.png","CopyToMask":-1,"filePath":"datafiles/icons",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/images/advisor/splash",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"11.png","CopyToMask":-1,"filePath":"datafiles/images/advisor/splash",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"12.png","CopyToMask":-1,"filePath":"datafiles/images/advisor/splash",}, @@ -961,6 +963,10 @@ {"id":{"name":"spr_ground_las","path":"sprites/spr_ground_las/spr_ground_las.yy",},}, {"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},}, {"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},}, + {"id":{"name":"spr_unit_card_icons","path":"sprites/spr_unit_card_icons/spr_unit_card_icons.yy",},}, + {"id":{"name":"spr_pixel_button_right","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},}, + {"id":{"name":"spr_pixel_button_middle","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},}, + {"id":{"name":"spr_pixel_button_left","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},}, {"id":{"name":"spr_green_las","path":"sprites/spr_green_las/spr_green_las.yy",},}, {"id":{"name":"spr_ground_conv","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},}, {"id":{"name":"spr_mk4_right_trim","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},}, diff --git a/fonts/fnt_menu/fnt_menu.old.png b/fonts/fnt_menu/fnt_menu.old.png index 6bbf675c06..0aa6a957a8 100644 Binary files a/fonts/fnt_menu/fnt_menu.old.png and b/fonts/fnt_menu/fnt_menu.old.png differ diff --git a/fonts/fnt_menu/fnt_menu.png b/fonts/fnt_menu/fnt_menu.png index 0aa6a957a8..ceff0e4130 100644 Binary files a/fonts/fnt_menu/fnt_menu.png and b/fonts/fnt_menu/fnt_menu.png differ diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index a220a0ce97..b4a35a6fae 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -60,10 +60,12 @@ function UnitButtonObject(data = false) constructor{ v_gap= 4; label= ""; alpha= 1; - color= #50a076; + color = #50a076; keystroke = false; tooltip = ""; bind_method = ""; + style = "standard"; + font=fnt_40k_14b static update_loc = function(){ @@ -107,11 +109,49 @@ function UnitButtonObject(data = false) constructor{ } } static draw = function(allow_click = true){ + var cur_alpha = draw_get_alpha(); + var cur_font = draw_get_font(); + var cur_color = draw_get_color(); + var cur_halign = draw_get_halign(); + var cur_valign = draw_get_valign(); + if (style = "standard"){ + var _button_click_area = draw_unit_buttons(w > 0 ? [x1, y1, x2, y2] : [x1, y1] , label, [1,1],color,,font,alpha); + } else if (style = "pixel"){ + + var _widths = [sprite_get_width(spr_pixel_button_left), sprite_get_width(spr_pixel_button_middle), sprite_get_width(spr_pixel_button_right)] + + var height_scale = h/sprite_get_height(spr_pixel_button_left); + _widths[0]*=height_scale; + _widths[2]*=height_scale; + draw_sprite_ext(spr_pixel_button_left, 0, x1, y1, height_scale, height_scale, 0, c_white, 1); + var _width_scale = w/_widths[1]; + _widths[1] *= _width_scale; + draw_sprite_ext(spr_pixel_button_middle, 0, x1 + _widths[0], y1, _width_scale, height_scale, 0, c_white, 1); + draw_sprite_ext(spr_pixel_button_right, 0, x1 + _widths[0] + _widths[1] ,y1, height_scale, height_scale, 0, c_white, 1); + var _text_position_x = x1 + ((_widths[0] + 2) * height_scale); + _text_position_x += (_widths[1]) / 2; + draw_set_font(font); + draw_set_halign(fa_center); + draw_set_valign(fa_middle); + draw_set_color(color); + draw_text_transformed(_text_position_x, y1 + ( (h * height_scale)/2), label, 1, 1, 0); + + x2 = x1 + array_sum(_widths); + y2 = y1 + h; + var _button_click_area = [x1, y1, x2, y2]; + } + draw_set_alpha(cur_alpha); + draw_set_font(cur_font); + draw_set_color(cur_color); + draw_set_halign(cur_halign); + draw_set_valign(cur_valign); + if (scr_hit(x1, y1, x2, y2) && tooltip!=""){ tooltip_draw(tooltip); } + if (allow_click){ - var clicked = point_and_click(draw_unit_buttons(w > 0 ? [x1, y1, x2, y2] : [x1, y1] , label, [1,1],color,,,alpha)) || keystroke; + var clicked = point_and_click(_button_click_area) || keystroke; if (clicked){ if (is_callable(bind_method)){ bind_method(); @@ -119,7 +159,6 @@ function UnitButtonObject(data = false) constructor{ } return clicked } else { - draw_unit_buttons([x1, y1, x2, y2], label, [1,1],color,,,alpha); return false; } } diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 5b526d5845..1392603c2d 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -120,6 +120,25 @@ function scr_toggle_manage(){ popup=0; selected=0; hide_banner=1; + management_buttons = { + squad_toggle : new UnitButtonObject({ + style : "pixel", + label : "Squad View", + tooltip : "Click here or press S to toggle Squad View." + }), + + profile_toggle : new UnitButtonObject({ + style : "pixel", + label : "Show Profile", + tooltip : "Click here or press P to show unit profile." + }), + + bio_toggle : new UnitButtonObject({ + style : "pixel", + label : "Show Bio", + tooltip : "Click here or press B to Toggle Unit Biography." + }), + } } else if (menu==1){ menu=0; diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index b1583cecc6..a86eecf473 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -225,8 +225,9 @@ function scr_ui_manage() { unit_view_block.y2 = unit_view_block.y1 + unit_view_block.h;*/ draw_set_color(c_white); - draw_sprite_stretched(spr_data_slate_back, 0, xx+1007-1, yy+140, 572, 378); - draw_sprite_stretched(spr_data_slate_border, 0, xx+1007-1, yy+140, 572, 378); + draw_sprite_stretched(spr_data_slate_back, 0, xx+1008-1, yy+140, 572, 378); + draw_sprite_stretched(spr_unit_card_icons, 0, xx+1007-1, yy+140, 166, 167); + // draw_sprite_stretched(spr_data_slate_border, 0, xx+1008-1, yy+140, 572, 378); Old Location // draw_rectangle_color_simple(xx+1007, yy+140, xx+1579, yy+519, 0, c_white, 0.05); draw_rectangle_color_simple(xx+1007, yy+140, xx+1579, yy+519, 0, 5998382, 0.05); // Swap between squad view and normal view @@ -241,54 +242,46 @@ function scr_ui_manage() { var no_other_instances = !instance_exists(obj_temp3) && !instance_exists(obj_popup); var stat_tool_tip_text; var button_coords; - if (!obj_controller.view_squad && !obj_controller.company_report){ - stat_tool_tip_text = "Squad View"; - } else { - stat_tool_tip_text = "Company View"; - } - var x5=right_ui_block.x1+15;//this should be relational with the unit area tab - var y5=right_ui_block.y1+8; - var x6=x5+string_width("Company View")+8; - var y6=y5+string_height("Company View")+2; - button_coords = draw_unit_buttons([x5, y5, x6, y6], stat_tool_tip_text,[1,1],#50a076); - array_push(tooltip_drawing, ["Click here or press S to toggle Squad View.", [x5,y5,x6,y6]]); - if ( point_and_click([x5,y5,x6,y6]) || (keyboard_check_pressed(ord("S")) && !text_bar)){ - obj_controller.view_squad = !obj_controller.view_squad; - if (stat_tool_tip_text=="Squad View"){ + var _squad_button = management_buttons.squad_toggle; + _squad_button.update({ + x1 : right_ui_block.x1+5, + y1 : right_ui_block.y1+6, + label : !obj_controller.view_squad && !obj_controller.company_report ? "Squad View" : "Company View", + keystroke : keyboard_check_pressed(ord("S")) + }); + + if (_squad_button.draw(!text_bar)){ + view_squad = !view_squad + if (view_squad){ new_company_struct(); - obj_controller.unit_profile = true; - } else { - obj_controller.unit_profile = false; } } + if (!view_squad){ - stat_tool_tip_text = !unit_profile ? "Show Profile" : "Hide Profile"; - - x5=x6+4; - x6=x5+string_width("Show Profile")+8; - array_push(tooltip_drawing, ["Click here or press P to show unit profile.", [x5,y5,x6,y6]]); - button_coords = draw_unit_buttons([x5, y5, x6, y6], stat_tool_tip_text,[1,1],#50a076) - if (((keyboard_check_pressed(ord("P"))&& !text_bar)|| (point_and_click(button_coords))) && no_other_instances){ - unit_profile = !unit_profile; - } - x5=x6+4; - } - - if (unit_profile && !view_squad){ - if (!unit_bio){ - stat_tool_tip_text = "Show Bio" - } else { - stat_tool_tip_text = "Hide Bio"; - } - x6=x5+string_width("Hide Bio")+8; - button_coords = draw_unit_buttons([x5, y5, x6, y6], stat_tool_tip_text,[1,1],#50a076); - array_push(tooltip_drawing, ["Click here or press B to Toggle Unit Biography.", button_coords]); - if (((keyboard_check_pressed(ord("B"))&& !text_bar)|| (point_and_click(button_coords))) && no_other_instances){ - unit_bio = !unit_bio; + var _profile_toggle = management_buttons.profile_toggle; + _profile_toggle.update({ + label : !unit_profile ? "Show Profile" : "Hide Profile", + x1 : _squad_button.x2, + y1 : _squad_button.y1, + keystroke : keyboard_check_pressed(ord("P")) + }); + if (_profile_toggle.draw(!text_bar)){ + unit_profile = !unit_profile + } - } + var bio_toggle = management_buttons.profile_toggle; + bio_toggle.update({ + label : !unit_bio ? "Show Bio" : "Hide Bio", + x1 : _profile_toggle.x2, + y1 : _profile_toggle.y1, + keystroke : keyboard_check_pressed(ord("B")) + }); + if (bio_toggle.draw(!text_bar)){ + unit_bio = !unit_bio + } + } if (managing<0 && selection_data.purpose_code!="manage") then unit_profile=true; //TODO Implement company report @@ -313,7 +306,7 @@ function scr_ui_manage() { // Draw unit image draw_set_color(c_white); if (is_struct(temp[121])){ - temp[121].draw(xx+1208, yy+240) + temp[121].draw(xx+1328, yy+240) } //TODO implement tooltip explaining potential loyalty hit of demoting a sgt @@ -336,7 +329,7 @@ function scr_ui_manage() { // Draw unit name and role draw_set_halign(fa_center); draw_set_font(fnt_40k_30b); - draw_text_transformed_outline(xx+1290,yy+177,string_hash_to_newline(selected_unit.name_role()),0.7,0.7,0); + draw_text_transformed_outline(xx+1290,yy+182,selected_unit.name_role(),0.7,0.7,0); // Draw unit info draw_set_font(fnt_40k_14); @@ -350,7 +343,7 @@ function scr_ui_manage() { var_text= string_hash_to_newline(selected_unit.equipments_qual_string("armour", true)); tooltip_text = cn.temp[103]; x1 = x_left; - y1 = yy+216; + y1 = yy+320; x2 = x1+string_width_ext(var_text, -1,187); y2 = y1+string_height_ext(var_text, -1,187); draw_set_alpha(1); @@ -363,7 +356,7 @@ function scr_ui_manage() { var_text= string_hash_to_newline(selected_unit.equipments_qual_string("gear", true)); tooltip_text = cn.temp[105]; x1 = x_left; - y1 = yy+260; + y1 = yy+446; x2 = x1+string_width_ext(var_text, -1,187); y2 = y1+string_height_ext(var_text, -1,187); draw_text_ext_outline(x1,y1,var_text,-1,187, 0, quality_color(selected_unit.gear_quality)); @@ -375,7 +368,7 @@ function scr_ui_manage() { var_text= string_hash_to_newline(selected_unit.equipments_qual_string("mobi", true)); tooltip_text = cn.temp[107]; x1 = x_left; - y1 = yy+304; + y1 = yy+467; x2 = x1+string_width_ext(var_text, -1,187); y2 = y1+string_height_ext(var_text, -1,187); draw_text_ext_outline(x1,y1,var_text,-1,187, 0, quality_color(selected_unit.mobility_item_quality)); @@ -383,14 +376,15 @@ function scr_ui_manage() { } // Stats - var_text = string_hash_to_newline(string("Bionics: {0}",selected_unit.bionics)); - x1 = x_left; - y1 = yy+444; + var_text = string_hash_to_newline(string(" {0}",selected_unit.bionics)); // Bionics tracker + x1 = x_left+82; + y1 = yy+209; x2 = x1+string_width(var_text); y2 = y1+string_height(var_text); draw_text_outline(x1,y1,var_text); var _body_parts = ARR_body_parts; var _body_parts_display = ARR_body_parts_display; + bionic_tooltip = "Bionic Augmentation is something a unit can do to both enhance their capabilities, but also replace a missing limb to get back into the fight. There is a limit of 10 Bionic augmentations. After that the damage is so extensive that a marine requires a dreadnought to keep going. For everyone else? It's time for the emperor's mercy.##Current Bionic Augmentations:#"; for (var part = 0; part","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"c95aaa9a-0e1a-4d57-95cb-018fbd09327f","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},},},"Disabled":false,"id":"939ed6c9-8a31-4f5e-85b6-b33ad46e198f","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},},},"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null, @@ -70,5 +70,5 @@ }, "type": 0, "VTile": false, - "width": 850, + "width": 572, } \ No newline at end of file diff --git a/sprites/spr_pixel_button_left/8a326ff2-8fec-4031-abef-2b299f66f9b0.png b/sprites/spr_pixel_button_left/8a326ff2-8fec-4031-abef-2b299f66f9b0.png new file mode 100644 index 0000000000..bbb5a0b4ef Binary files /dev/null and b/sprites/spr_pixel_button_left/8a326ff2-8fec-4031-abef-2b299f66f9b0.png differ diff --git a/sprites/spr_pixel_button_left/layers/8a326ff2-8fec-4031-abef-2b299f66f9b0/54aa992a-59f5-408f-a377-80c79f6e44c3.png b/sprites/spr_pixel_button_left/layers/8a326ff2-8fec-4031-abef-2b299f66f9b0/54aa992a-59f5-408f-a377-80c79f6e44c3.png new file mode 100644 index 0000000000..bbb5a0b4ef Binary files /dev/null and b/sprites/spr_pixel_button_left/layers/8a326ff2-8fec-4031-abef-2b299f66f9b0/54aa992a-59f5-408f-a377-80c79f6e44c3.png differ diff --git a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy new file mode 100644 index 0000000000..19c04beee6 --- /dev/null +++ b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_pixel_button_left", + "bbox_bottom": 27, + "bbox_left": 0, + "bbox_right": 13, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8a326ff2-8fec-4031-abef-2b299f66f9b0",}, + ], + "gridX": 0, + "gridY": 0, + "height": 28, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"54aa992a-59f5-408f-a377-80c79f6e44c3","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Menu and Load", + "path": "folders/Sprites/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_pixel_button_left", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},},},"Disabled":false,"id":"c35b10b1-5374-4d18-bff9-7373fd5c1c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 14, +} \ No newline at end of file diff --git a/sprites/spr_pixel_button_middle/7ab35a5d-4138-4cd7-a5ce-654faab31f81.png b/sprites/spr_pixel_button_middle/7ab35a5d-4138-4cd7-a5ce-654faab31f81.png new file mode 100644 index 0000000000..80e37e64b9 Binary files /dev/null and b/sprites/spr_pixel_button_middle/7ab35a5d-4138-4cd7-a5ce-654faab31f81.png differ diff --git a/sprites/spr_pixel_button_middle/layers/7ab35a5d-4138-4cd7-a5ce-654faab31f81/882c37ff-59fd-4b4b-953b-113914941279.png b/sprites/spr_pixel_button_middle/layers/7ab35a5d-4138-4cd7-a5ce-654faab31f81/882c37ff-59fd-4b4b-953b-113914941279.png new file mode 100644 index 0000000000..80e37e64b9 Binary files /dev/null and b/sprites/spr_pixel_button_middle/layers/7ab35a5d-4138-4cd7-a5ce-654faab31f81/882c37ff-59fd-4b4b-953b-113914941279.png differ diff --git a/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy new file mode 100644 index 0000000000..71280766fb --- /dev/null +++ b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_pixel_button_middle", + "bbox_bottom": 27, + "bbox_left": 0, + "bbox_right": 13, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81",}, + ], + "gridX": 0, + "gridY": 0, + "height": 28, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"882c37ff-59fd-4b4b-953b-113914941279","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Menu and Load", + "path": "folders/Sprites/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_pixel_button_middle", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},},},"Disabled":false,"id":"0b9d0197-8c88-4a7d-908c-67e942c40821","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 14, +} \ No newline at end of file diff --git a/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png b/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png new file mode 100644 index 0000000000..b878b3c467 Binary files /dev/null and b/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png differ diff --git a/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png b/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png new file mode 100644 index 0000000000..b878b3c467 Binary files /dev/null and b/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png differ diff --git a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy new file mode 100644 index 0000000000..3db542ed8d --- /dev/null +++ b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_pixel_button_right", + "bbox_bottom": 27, + "bbox_left": 0, + "bbox_right": 13, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29",}, + ], + "gridX": 0, + "gridY": 0, + "height": 28, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a3934012-92f7-4b26-ba15-b4043a5867b4","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Menu and Load", + "path": "folders/Sprites/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_pixel_button_right", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},},},"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 14, +} \ No newline at end of file diff --git a/sprites/spr_unit_card_icons/43e88041-0bdc-4640-969f-8072a760ffb8.png b/sprites/spr_unit_card_icons/43e88041-0bdc-4640-969f-8072a760ffb8.png new file mode 100644 index 0000000000..9d0e73f67f Binary files /dev/null and b/sprites/spr_unit_card_icons/43e88041-0bdc-4640-969f-8072a760ffb8.png differ diff --git a/sprites/spr_unit_card_icons/layers/43e88041-0bdc-4640-969f-8072a760ffb8/6678ebe2-e37c-439c-978e-072e4d89fc24.png b/sprites/spr_unit_card_icons/layers/43e88041-0bdc-4640-969f-8072a760ffb8/6678ebe2-e37c-439c-978e-072e4d89fc24.png new file mode 100644 index 0000000000..9d0e73f67f Binary files /dev/null and b/sprites/spr_unit_card_icons/layers/43e88041-0bdc-4640-969f-8072a760ffb8/6678ebe2-e37c-439c-978e-072e4d89fc24.png differ diff --git a/sprites/spr_unit_card_icons/spr_unit_card_icons.yy b/sprites/spr_unit_card_icons/spr_unit_card_icons.yy new file mode 100644 index 0000000000..6c66b41ed2 --- /dev/null +++ b/sprites/spr_unit_card_icons/spr_unit_card_icons.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_unit_card_icons", + "bbox_bottom": 162, + "bbox_left": 15, + "bbox_right": 124, + "bbox_top": 44, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"43e88041-0bdc-4640-969f-8072a760ffb8",}, + ], + "gridX": 0, + "gridY": 0, + "height": 167, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"6678ebe2-e37c-439c-978e-072e4d89fc24","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Menu and Load", + "path": "folders/Sprites/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_unit_card_icons", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"43e88041-0bdc-4640-969f-8072a760ffb8","path":"sprites/spr_unit_card_icons/spr_unit_card_icons.yy",},},},"Disabled":false,"id":"da1b7991-b1ea-473c-ab79-2afdf9c5df6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 166, +} \ No newline at end of file