From 0eec479fc0544eaedb668440aad92584f874364b Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 4 Aug 2025 16:56:06 +0100 Subject: [PATCH 01/13] improve sub component system --- ChapterMaster.yyp | 2 + scripts/scr_ComplexSet/scr_ComplexSet.gml | 503 ++++++++++-------- .../scr_culture_visuals.gml | 29 +- .../scr_draw_unit_image.gml | 108 +--- .../0ca30034-8ae6-44ea-ab2a-6277d1920908.png | Bin 0 -> 868 bytes .../587d63a4-32c8-4617-9c28-59a8a099c2c1.png | Bin 0 -> 1107 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 0 -> 868 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 0 -> 1107 bytes .../spr_combat_shield_bottom_part.yy | 96 ++++ .../350bde68-1664-48e8-97c4-7cff3c59b4ae.png | Bin 1971 -> 1596 bytes .../587d63a4-32c8-4617-9c28-59a8a099c2c1.png | Bin 2685 -> 2292 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 1971 -> 1596 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 2685 -> 2292 bytes .../spr_gear_combat_shield.yy | 10 +- .../3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png | Bin 0 -> 555 bytes .../61531cde-cd44-4806-ae39-3c63f51d65de.png | Bin 0 -> 520 bytes .../4ff43f57-b34a-4219-8298-0399265c623b.png | Bin 0 -> 555 bytes .../4ff43f57-b34a-4219-8298-0399265c623b.png | Bin 0 -> 520 bytes .../a4c8b294-e4be-4fef-8912-4d706c9cec44.png | Bin 0 -> 575 bytes .../b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png | Bin 0 -> 468 bytes .../d292644f-2a3b-4981-868a-a423161e3739.png | Bin 0 -> 468 bytes sprites/spr_sgt_forehead/spr_sgt_forehead.yy | 96 ++++ 22 files changed, 498 insertions(+), 346 deletions(-) create mode 100644 sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png create mode 100644 sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png create mode 100644 sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png create mode 100644 sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png create mode 100644 sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy create mode 100644 sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png create mode 100644 sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png create mode 100644 sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png create mode 100644 sprites/spr_sgt_forehead/spr_sgt_forehead.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 09fa95f3cb..565132e8fe 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1103,6 +1103,7 @@ {"id":{"name":"spr_clothing_colors","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},}, {"id":{"name":"spr_cm_specialty","path":"sprites/spr_cm_specialty/spr_cm_specialty.yy",},}, {"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},}, + {"id":{"name":"spr_combat_shield_bottom_part","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},}, {"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, {"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},}, @@ -1534,6 +1535,7 @@ {"id":{"name":"spr_servo_harness","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},}, {"id":{"name":"spr_settings_bg","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},}, {"id":{"name":"spr_settings_button","path":"sprites/spr_settings_button/spr_settings_button.yy",},}, + {"id":{"name":"spr_sgt_forehead","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},}, {"id":{"name":"spr_ship_aconite","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},}, {"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},}, {"id":{"name":"spr_ship_apoc","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 1c108d09fd..a7991417c1 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -134,269 +134,279 @@ function ComplexSet(_unit) constructor { right_arm_data = []; - static assign_modulars = function(modulars = global.modular_drawing_items, position = false) { - var _mod = {}; - var _sub_comps = false + static base_modulars_checks = function(mod_item){ + _are_exceptions = false; + var _mod = mod_item; + exceptions = []; - try { - for (var i = 0; i < array_length(modulars); i++) { - _are_exceptions = false; - _mod = modulars[i]; - exceptions = []; - _sub_comps = "none"; - - if (array_contains(blocked, _mod.position)) { - continue; - } + if (array_contains(blocked, _mod.position)) { + return false; + } - if (struct_exists(_mod, "allow_either")) { - _are_exceptions = true; - exceptions = []; - for (var m = 0; m < array_length(_mod.allow_either); m++) { - array_push(exceptions, _mod.allow_either[m]); + if (struct_exists(_mod, "allow_either")) { + _are_exceptions = true; + exceptions = []; + for (var m = 0; m < array_length(_mod.allow_either); m++) { + array_push(exceptions, _mod.allow_either[m]); + } + } + if (struct_exists(_mod, "max_saturation")) { + var _max_sat = _mod.max_saturation; + } + if (struct_exists(_mod, "exp")) { + var _exp_data = _mod.exp; + var _min = 0; + if (struct_exists(_exp_data, "min")) { + _min = _exp_data.min; + if (unit.experience < _exp_data.min) { + if (!check_exception("min_exp")) { + return false; } } - if (struct_exists(_mod, "max_saturation")) { - var _max_sat = _mod.max_saturation; + } + if (struct_exists(_exp_data, "scale")) { + var _m_exp = _exp_data.exp_scale_max; + var _increment_count = _mod.max_saturation / 5; + var _increments = (_m_exp - _min) / _increment_count; + var _sat_roof = _mod.max_saturation; + var _mar_exp = unit.experience; + + if (_mar_exp >= _m_exp) { + spawn_chance = _mod.max_saturation; + } else { + var calc_exp = _mar_exp - _min; + var _inc_point = floor(_mar_exp / _increments); + _max_sat = _inc_point * 5; } - if (struct_exists(_mod, "exp")) { - var _exp_data = _mod.exp; - var _min = 0; - if (struct_exists(_exp_data, "min")) { - _min = _exp_data.min; - if (unit.experience < _exp_data.min) { - if (!check_exception("min_exp")) { - continue; - } - } - } - if (struct_exists(_exp_data, "scale")) { - var _m_exp = _exp_data.exp_scale_max; - var _increment_count = _mod.max_saturation / 5; - var _increments = (_m_exp - _min) / _increment_count; - var _sat_roof = _mod.max_saturation; - var _mar_exp = unit.experience; - - if (_mar_exp >= _m_exp) { - spawn_chance = _mod.max_saturation; - } else { - var calc_exp = _mar_exp - _min; - var _inc_point = floor(_mar_exp / _increments); - _max_sat = _inc_point * 5; - } + } + } + if (struct_exists(_mod, "max_saturation")) { + if (struct_exists(variation_map, _mod.position)) { + if (variation_map[$ _mod.position] >= _max_sat) { + if (!check_exception("max_saturation")) { + return false; } } - if (struct_exists(_mod, "max_saturation")) { - if (struct_exists(variation_map, _mod.position)) { - if (variation_map[$ _mod.position] >= _max_sat) { - if (!check_exception("max_saturation")) { - continue; - } - } - } + } + } + if (!struct_exists(_mod, "body_types")) { + _mod.body_types = [0, 1, 2]; + } + + if (!array_contains(_mod.body_types, armour_type)) { + if (!check_exception("body_types")) { + return false; + } + } + + if (struct_exists(_mod, "role_type")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.role_type); a++) { + var _r_t = _mod.role_type[a]; + _viable = unit.IsSpecialist(_r_t); + if (_viable) { + break; } - if (!struct_exists(_mod, "body_types")) { - _mod.body_types = [0, 1, 2]; + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + return false; } - - if (!array_contains(_mod.body_types, armour_type)) { - if (!check_exception("body_types")) { - continue; - } + if (!check_exception("chapter_disadv")) { + return false; } - - if (struct_exists(_mod, "role_type")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.role_type); a++) { - var _r_t = _mod.role_type[a]; - _viable = unit.IsSpecialist(_r_t); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - continue; - } - if (!check_exception("chapter_disadv")) { - continue; - } - } + } + } + if (struct_exists(_mod, "roles")) { + if (!array_contains(_mod.roles, unit.role())) { + if (!check_exception("roles")) { + return false; } - if (struct_exists(_mod, "roles")) { - if (!array_contains(_mod.roles, unit.role())) { - if (!check_exception("roles")) { - continue; - } - } + } + } + if (struct_exists(_mod, "cultures")) { + if (!scr_has_style(_mod.cultures)) { + if (!check_exception("cultures")) { + return false; } - if (struct_exists(_mod, "cultures")) { - if (!scr_has_style(_mod.cultures)) { - if (!check_exception("cultures")) { - continue; - } - } + } + } + if (struct_exists(_mod, "company")) { + if (!array_contains(_mod.company, unit.company)) { + if (!check_exception("company")) { + return false; } - if (struct_exists(_mod, "company")) { - if (!array_contains(_mod.company, unit.company)) { - if (!check_exception("company")) { - continue; - } - } + } + } + if (struct_exists(_mod, "armours")) { + if (!array_contains(_mod.armours, unit_armour)) { + if (!check_exception("armours")) { + return false; } - if (struct_exists(_mod, "armours")) { - if (!array_contains(_mod.armours, unit_armour)) { - if (!check_exception("armours")) { - continue; - } - } + } + } + if (struct_exists(_mod, "armours_exclude")) { + if (array_contains(_mod.armours_exclude, unit_armour)) { + if (!check_exception("armours_exclude")) { + return false; } - if (struct_exists(_mod, "armours_exclude")) { - if (array_contains(_mod.armours_exclude, unit_armour)) { - if (!check_exception("armours_exclude")) { - continue; - } - } + } + } + if (struct_exists(_mod, "chapter_adv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_adv); a++) { + var _adv = _mod.chapter_adv[a]; + _viable = scr_has_adv(_adv); + if (_viable) { + break; } - if (struct_exists(_mod, "chapter_adv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_adv); a++) { - var _adv = _mod.chapter_adv[a]; - _viable = scr_has_adv(_adv); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + return false; } - if (struct_exists(_mod, "chapter_disadv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { - var _disadv = _mod.chapter_disadv[a]; - _viable = scr_has_disadv(_disadv); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_disadv")) { - continue; - } - } + } + } + if (struct_exists(_mod, "chapter_disadv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { + var _disadv = _mod.chapter_disadv[a]; + _viable = scr_has_disadv(_disadv); + if (_viable) { + break; } - if (struct_exists(_mod, "stats")) { - if (!stat_valuator(_mod.stats, unit)) { - if (!check_exception("stats")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("chapter_disadv")) { + return false; } - if (struct_exists(_mod, "equipped")) { - if (!unit.has_equipped(_mod.equipped)) { - if (!check_exception("equipped")) { - continue; - } - } + } + } + if (struct_exists(_mod, "stats")) { + if (!stat_valuator(_mod.stats, unit)) { + if (!check_exception("stats")) { + return false; + } + } + } + if (struct_exists(_mod, "equipped")) { + if (!unit.has_equipped(_mod.equipped)) { + if (!check_exception("equipped")) { + return false; } + } + } - if (struct_exists(_mod, "traits")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.traits); a++) { - var _trait = _mod.traits[a]; - _viable = unit.has_trait(_trait); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("traits")) { - continue; - } - } + if (struct_exists(_mod, "traits")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.traits); a++) { + var _trait = _mod.traits[a]; + _viable = unit.has_trait(_trait); + if (_viable) { + break; } - if (struct_exists(_mod, "chapter")) { - var chap_name = instance_exists(obj_creation) ? obj_creation.chapter_name : global.chapter_name; - if (chap_name != _mod.chapter) { - if (!check_exception("chapter")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("traits")) { + return false; } - - var _overides = "none"; - if (struct_exists(_mod, "overides")) { - _overides = _mod.overides; + } + } + if (struct_exists(_mod, "chapter")) { + var chap_name = instance_exists(obj_creation) ? obj_creation.chapter_name : global.chapter_name; + if (chap_name != _mod.chapter) { + if (!check_exception("chapter")) { + return false; } + } + } - if (struct_exists(_mod, "subcomponents")){ - _sub_comps = _mod.subcomponents; + _overides = "none"; + if (struct_exists(_mod, "overides")) { + _overides = _mod.overides; + } + + if (struct_exists(_mod, "subcomponents")){ + _sub_comps = _mod.subcomponents; + } + + if (struct_exists(_mod, "body_parts")){ + var _viable = true; + var _body_areas = struct_get_names(_mod.body_parts); + for (var b=0;b= _status_level) { + var variation_tier = (_unit_tier - _status_level) + 1; + if (variation_map[$ _area] % variation_tier != 0) { + return false; + } + } + } - var _unit_tier = 8; - if (_unit_tier == 8) { - for (var t = 0; t < array_length(tiers); t++) { - var tier = tiers[t]; - if (array_contains(tier, unit.role())) { - _unit_tier = t; - } - } - } - if (_unit_tier >= _status_level) { - var variation_tier = (_unit_tier - _status_level) + 1; - if (variation_map[$ _area] % variation_tier != 0) { - continue; - } - } - } + return true; + } + static assign_modulars = function(modulars = global.modular_drawing_items, position = false) { + var _mod = {}; + try { + for (var i = 0; i < array_length(modulars); i++) { + _sub_comps = "none"; + _mod = modulars[i]; + var _allowed = base_modulars_checks(_mod); + + if (!_allowed){ + continue; + } if (position != false) { if (position == "weapon") { var _weapon_map = _mod.weapon_map; @@ -476,6 +486,7 @@ function ComplexSet(_unit) constructor { left_weapon: unit.get_body_data("weapon_variation", "left_arm"), right_weapon: unit.get_body_data("weapon_variation", "right_arm"), necklace : unit.get_body_data("hanging_variant", "throat"), + foreground_item : unit.get_body_data("variant", "throat"), }; static draw_component = function(component_name, texture_draws = {}) { @@ -575,13 +586,13 @@ function ComplexSet(_unit) constructor { //show_debug_message($"subcomponents 2: {_subcomponents}"); var _sub_choice = 0; if (_map_choice != 0){ - _sub_choice = sqr(_map_choice + 1) - i; + _sub_choice = floor(sin(_map_choice) * 100); } var _total_options = -1; for (var s=0;s -1){ if (_total_options == 0){ @@ -591,11 +602,12 @@ function ComplexSet(_unit) constructor { _sub_choice_final = _sub_choice % (_total_options+1); } - //show_debug_message($"{_sub_choice_final}"); + show_debug_message($"{_sub_choice_final}"); _choice_count = 0; for (var s=0;s= _choice_count && _sub_choice_final < _choice_count+sprite_get_number(_subcomponents[s])){ + show_debug_message($"{_sub_choice_final}, {_choice_count}"); draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, x_surface_offset, y_surface_offset); break; } else { @@ -929,7 +941,8 @@ function ComplexSet(_unit) constructor { "left_pauldron_embeleshments", "right_pauldron_hangings", "left_pauldron_hangings", - "left_personal_livery" + "left_personal_livery", + "foreground_item", ]; } else { _draw_order = [ @@ -964,7 +977,8 @@ function ComplexSet(_unit) constructor { "tabbard", "robe", "belt", - "left_personal_livery" + "left_personal_livery", + "foreground_item", ]; } for (var i = 0; i < array_length(_draw_order); i++) { @@ -1295,7 +1309,26 @@ function ComplexSet(_unit) constructor { if (!struct_exists(subcomponents, area)) { subcomponents[$ area] = []; } - array_push(subcomponents[$ area], [_overide_start, _overide_start + sprite_length, sub_components]); + var _accepted_subs = []; + for (var i=0;i= 10) && (!modest_livery)) { - draw_sprite(armour_sprite, dev_trait, x_surface_offset, y_surface_offset); - } // Devastator Doctrine battle damage - // if (tech_brothers_trait>=0) and (modest_livery=0) then draw_sprite(spr_gear_techb,tech_brothers_trait,x_surface_offset,y_surface_offset);// Tech-Brothers bling - //sgt helms - // Apothecary Details if (unit_specialization == UnitSpecialization.Apothecary) { if (unit_armour == "Tartaros") { @@ -574,40 +506,6 @@ function scr_draw_unit_image(_background = false) { } } } - - // Draw Custom Helmets - if (armour_type == ArmourType.Normal && !armour_bypass) { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); - } - if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { - draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); - } - } else if (unit_armour == "Terminator Armour" && !armour_bypass) { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); - } - if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { - draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); - } - } - - var shield_offset_x = 0; - var shield_offset_y = 0; - if (unit_armour == "Terminator Armour") { - shield_offset_x = -15; - shield_offset_y = -10; - } else if (unit_armour == "Tartaros") { - shield_offset_x = -8; - } - if (gear() == "Combat Shield") { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_gear_combat_shield, 1, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); - } else { - draw_sprite(spr_gear_combat_shield, 0, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); - } - } - // if (reverent_guardians=1) then draw_sprite(spr_pack_brazier,1,x_surface_offset,y_surface_offset); if (armour_type == ArmourType.Dreadnought) { var left_arm = dreadnought_sprite_components(weapon_two()); diff --git a/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png b/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png new file mode 100644 index 0000000000000000000000000000000000000000..8d5f84a1a4e0290ded996aeac308be4496fc8005 GIT binary patch literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrsxTlL_NX4zUw;YQW z8wfBsRBHR5US4!EQUB+af4zGhyv}%?deGwPw`+BbsKKF0=@OiCK#mw_kdSryS5?aW zM4tQC);}rqu9zC+Rr&kx@+rr8-);I|=(v84((Chan>cs$6+e6RKUs$N zkbUPi*1u1`TKfIn{r%c`tL$I>&tv(%yxx4DQ{8jD<>Jz{Go$9`zP@yC*Vaj%J?~gI z&HcVuEAo4#H2Y`EAk|rp_nCIHT81sX_ifwyLgh_gSB9oecln(t|0+eM$NlS^0~1eG zN{24heXv(+%F2MRbL&^1O1sv(m^p$#?m4muD5fx0re0KUY*uft}ZZu-SM2#XX8MG4m@b zWqAMB@^j!nZcs7>fd?k_j2%IqlAHM4-GE%x64!{5l*E!$tK_0oAjM#0U}UOmV4-VZ z5@Kj#Wnyk+VxetdU}a#SG&y-2iiX_$l+3hB+!}(<-3D2z0k@$fGdH!kBr&%Dw;q<; SzpeuHFnGH9xvX2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%o2QFoNX4zUckJ^X zTZphfFz>c?ZD2VO_>4z$*=?&>J%J?#HH{_fmd`$vK4US<38re^T;VEHshf(ahD$cz zXP4-EXus$~UEPutMM0qX0|E~8%zm4DCnrDszuf&|%YPZR4W>ZeeJ`nlYZ_> z+<)7}<;dN?!6$!r#pJGkJpcH9{_n?^n5OtGkJ)fdrk-*28}-UA{*HT2QMFzDKk{eI zzvq6&|Ka+6{r2dpn2a0m%`)XP-<&^ly>{pBdaIK2A{V4$zwBK%v!{7FlhwOHMirLjsmxuHbqhwQ$YO625|3bKA>3tlR>dY1qCanDEYH1;t5^h=v2PwOi+N;~+*#ZR%z>U_xICjQ@d)BdPh z?&NQ}IsbcC;FZe0Ovww&+xMrhrwT;F6GND3g?~DB-pI!^s;ho0Xr7 zBwwu3Tjb>--k)lu_VA6zJI0G^mL__<|NZOj!#Uj5?Ju8y+&Sl}<#nE;DY;cSIiXA| zv%jsJUEp`NWvf@a$eB9R$l`BK2EVttC9W#F5XG{&{;rH}y~uMD{o}V-Us)~L^)z*5 znUT$+^%J?)FK#IZ0z{phBz(Uu+ zB*f6f%EZFT*i_rVz{NoH S4xMZSxzp3t&t;ucLK6UczP)__ literal 0 HcmV?d00001 diff --git a/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png new file mode 100644 index 0000000000000000000000000000000000000000..8d5f84a1a4e0290ded996aeac308be4496fc8005 GIT binary patch literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrsxTlL_NX4zUw;YQW z8wfBsRBHR5US4!EQUB+af4zGhyv}%?deGwPw`+BbsKKF0=@OiCK#mw_kdSryS5?aW zM4tQC);}rqu9zC+Rr&kx@+rr8-);I|=(v84((Chan>cs$6+e6RKUs$N zkbUPi*1u1`TKfIn{r%c`tL$I>&tv(%yxx4DQ{8jD<>Jz{Go$9`zP@yC*Vaj%J?~gI z&HcVuEAo4#H2Y`EAk|rp_nCIHT81sX_ifwyLgh_gSB9oecln(t|0+eM$NlS^0~1eG zN{24heXv(+%F2MRbL&^1O1sv(m^p$#?m4muD5fx0re0KUY*uft}ZZu-SM2#XX8MG4m@b zWqAMB@^j!nZcs7>fd?k_j2%IqlAHM4-GE%x64!{5l*E!$tK_0oAjM#0U}UOmV4-VZ z5@Kj#Wnyk+VxetdU}a#SG&y-2iiX_$l+3hB+!}(<-3D2z0k@$fGdH!kBr&%Dw;q<; SzpeuHFnGH9xvX2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%o2QFoNX4zUckJ^X zTZphfFz>c?ZD2VO_>4z$*=?&>J%J?#HH{_fmd`$vK4US<38re^T;VEHshf(ahD$cz zXP4-EXus$~UEPutMM0qX0|E~8%zm4DCnrDszuf&|%YPZR4W>ZeeJ`nlYZ_> z+<)7}<;dN?!6$!r#pJGkJpcH9{_n?^n5OtGkJ)fdrk-*28}-UA{*HT2QMFzDKk{eI zzvq6&|Ka+6{r2dpn2a0m%`)XP-<&^ly>{pBdaIK2A{V4$zwBK%v!{7FlhwOHMirLjsmxuHbqhwQ$YO625|3bKA>3tlR>dY1qCanDEYH1;t5^h=v2PwOi+N;~+*#ZR%z>U_xICjQ@d)BdPh z?&NQ}IsbcC;FZe0Ovww&+xMrhrwT;F6GND3g?~DB-pI!^s;ho0Xr7 zBwwu3Tjb>--k)lu_VA6zJI0G^mL__<|NZOj!#Uj5?Ju8y+&Sl}<#nE;DY;cSIiXA| zv%jsJUEp`NWvf@a$eB9R$l`BK2EVttC9W#F5XG{&{;rH}y~uMD{o}V-Us)~L^)z*5 znUT$+^%J?)FK#IZ0z{phBz(Uu+ zB*f6f%EZFT*i_rVz{NoH S4xMZSxzp3t&t;ucLK6UczP)__ literal 0 HcmV?d00001 diff --git a/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy b/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy new file mode 100644 index 0000000000..06b31e8c60 --- /dev/null +++ b/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_combat_shield_bottom_part", + "bboxMode":0, + "bbox_bottom":220, + "bbox_left":7, + "bbox_right":72, + "bbox_top":189, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","blendMode":0,"displayName":"default","isLocked":false,"name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_combat_shield_bottom_part", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_combat_shield_bottom_part", + "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":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_combat_shield_bottom_part", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"0ca30034-8ae6-44ea-ab2a-6277d1920908","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6a05f034-da34-4cbc-9334-b13b05307598","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.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":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png b/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png index cfd6c0fa37a19e0e5fab5b3d7733b2c81bb3f07a..5573062f6eccdf9e7e6a2ad4f88258804903b4be 100644 GIT binary patch delta 1416 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 diff --git a/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png b/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png index c38d46e2bce942fedf14d4234deb211f21a5fecd..a28266c3d86a112c7fcc6639274f2b3fea62fd2f 100644 GIT binary patch delta 2028 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 diff --git a/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png index ddbb04419c1302a5ce1bc2bcd6527a78cb5cca38..a28266c3d86a112c7fcc6639274f2b3fea62fd2f 100644 GIT binary patch delta 2028 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 p3s2L}$Kv|`Bcem#Fl4kpJo0DsZzE":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.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/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png b/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png new file mode 100644 index 0000000000000000000000000000000000000000..1abd8ff743b7eaefc238013f78115001ff038ee9 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slEO3u^8F{I+w+v|>e zOo{?52ac70_&@z;|Hr24g6orAE`$gQ9m;gFI-mm7Ogva~Jxu(AeAV3V@6JuTS{3@r zWIZ!?e6g$#}ATc~H~$A5pOeO|6gb*0K<&GR$neevIEslLK6>ej|K-!F?9 zFL7*Kn6AJoOuU`cSNUMMEkjPS+dq+KTs}b4RZCnWN>UO_QmvAUQh^kMk%5t^u7QQF zfk}v=iIt(Hm5Hggfq|8QfzGXY?I;>@^HVa@DsgLwZCA4fYS4h&P?DLOT3nKtTYy^+ T*Ch5QAU}J$`njxgN@xNA<^z1# literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png b/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png new file mode 100644 index 0000000000000000000000000000000000000000..e1666a53138feb53bb6e840b6bf05f32ddc2bba8 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(`R(cA7*cWT?R7)0 z0}28x4qyM*?-QArF!_{l@{G(aHq*Wy09i@`cwkfdoxxt{aO^tHmKn-PFVglVPkp;& zTQx();yIqbw$=DO(^Q}TbmsGqicBP!N`0kbyBLZYS@|Sx{m=m#u3F+6QIe8al4_M) zlnSI6j0}uSbqy?Z4NO7|O{@$ptxQa{4GgRd40LYIYe&(Lo1c=IR*73fY`dB@P=f~C fhLX(O)Z&uF+ydNsxF)eb0eRWe)z4*}Q$iB}1ek1( literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png new file mode 100644 index 0000000000000000000000000000000000000000..58dc547f3d7221096434d831dcebb7068476523b GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slEO3u^8F{I+w+v|>e zOo{?52ac70_&@z;|Hr24g6orAE`$gQ9m;gFI-mm7Ogva~Jxu(AeAV3V@6JuTS{3@r zWIZ!?e6g$#}ATc~H~$A5pOeO|6gb*0K<&GR$neevIEslLK6>ej|K-!F?9 zFL7*Kn6AJoOuU`cSNUMMEkjPS+dq+KTs}b4RZCnWN>UO_QmvAUQh^kMk%5tku7Rnp zk#UHTk(Gh5m9e3=fq|8Q!Nq;E&ZB6^%}>cptHiBg!DFRjpau=N4JDbmsl_FUxdpiO TeE-J02IOZ?S3j3^P645bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(`R(cA7*cWT?R7)0 z0}28x4qyM*?-QArF!_{l@{G(aHq*Wy09i@`cwkfdoxxt{aO^tHmKn-PFVglVPkp;& zTQx();yIqbw$=DO(^Q}TbmsGqicBP!N`0kbyBLZYS@|Sx{m=m#u3F+6QIe8al4_M) zlnSI6j0}uSbPY^(jf_K#46RJftc(n_4GgRd3?^QmrHi5=H$NpatrE9}2VF`Nff_X6 fHk4%MrWThZ<`&@Avwc3ZAIQs|u6{1-oD!M45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slE%E;5jF{I+w+v^v3 zn+!x8E?#>faPHBcGlv9JuIyiyY0$93!S=a$MdPz&OB8|ni2-v0-sHXXDUL3>`X43JsR!C z<~{g-BEQy6GC(#<^496+tADecysm3|!QuxocGFzV0eu_B6D?N1L$`}>1zM(B;u=ws zl30>zm0Xkxq!^40j7)S5OmvNmLyQcqObo3|jkFC6tPBi(*dF_Xq9HdwB{QuOw}#Gy mItQQz4Y&;@nYpROC5gEOxb@sCjh_$H!{F)a=d#Wzp$PymCyliL literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png new file mode 100644 index 0000000000000000000000000000000000000000..ca49a8f02c93d50d9dab93b0521d29488a02b046 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(IqvD=7*cWT?Lk9E zAn(wEul~85{tJN2Aq6U=j=f`G%!t0W8R%@)64!{5l*E!$tK_0oAjM#0U}U0eV4`be z9Aac>WnyS$YNTyoU}a$N!}i!86b-rgDVb@NxHWVp)Hwh(XuxeK$;?eHE=kNSz^&(A SY5aVk9tKZWKbLh*2~7aagHe?L literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png new file mode 100644 index 0000000000000000000000000000000000000000..ca49a8f02c93d50d9dab93b0521d29488a02b046 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(IqvD=7*cWT?Lk9E zAn(wEul~85{tJN2Aq6U=j=f`G%!t0W8R%@)64!{5l*E!$tK_0oAjM#0U}U0eV4`be z9Aac>WnyS$YNTyoU}a$N!}i!86b-rgDVb@NxHWVp)Hwh(XuxeK$;?eHE=kNSz^&(A SY5aVk9tKZWKbLh*2~7aagHe?L literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/spr_sgt_forehead.yy b/sprites/spr_sgt_forehead/spr_sgt_forehead.yy new file mode 100644 index 0000000000..38ebdd4f70 --- /dev/null +++ b/sprites/spr_sgt_forehead/spr_sgt_forehead.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_sgt_forehead", + "bboxMode":0, + "bbox_bottom":78, + "bbox_left":79, + "bbox_right":87, + "bbox_top":70, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4ff43f57-b34a-4219-8298-0399265c623b","blendMode":0,"displayName":"default","isLocked":false,"name":"4ff43f57-b34a-4219-8298-0399265c623b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_sgt_forehead", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"decorations", + "path":"folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_sgt_forehead", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_sgt_forehead", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.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":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.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":0, + "yorigin":51, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file From 8e66abec95fd6afa77559142abb8366612a9adac Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 6 Aug 2025 21:43:24 +0100 Subject: [PATCH 02/13] further tweaks --- ChapterMaster.yyp | 1 + objects/obj_turn_end/Draw_0.gml | 175 +----------------- objects/obj_turn_end/Draw_64.gml | 40 +++- scripts/scr_ComplexSet/scr_ComplexSet.gml | 64 +++++-- .../scr_culture_visuals.gml | 30 ++- .../scr_draw_unit_image.gml | 22 +-- sprites/spr_gear_apoth/spr_gear_apoth.yy | 12 +- .../3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png | Bin 726 -> 726 bytes .../db192a8c-3604-4553-bea9-59dc5e18b44c.png | Bin .../spr_gear_apoth_eye/spr_gear_apoth_eye.yy | 92 +++++++++ 10 files changed, 223 insertions(+), 213 deletions(-) rename sprites/{spr_gear_apoth => spr_gear_apoth_eye}/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png (73%) rename sprites/{spr_gear_apoth => spr_gear_apoth_eye}/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png (100%) create mode 100644 sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 565132e8fe..61e1f206b6 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1203,6 +1203,7 @@ {"id":{"name":"spr_formation_splash","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},}, {"id":{"name":"spr_fur_tabbard","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},}, {"id":{"name":"spr_fur_tail_topknot","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},}, + {"id":{"name":"spr_gear_apoth_eye","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},}, {"id":{"name":"spr_gear_apoth","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},}, {"id":{"name":"spr_gear_chap","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},}, {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},}, diff --git a/objects/obj_turn_end/Draw_0.gml b/objects/obj_turn_end/Draw_0.gml index 4163584fe1..17a7fc0f1d 100644 --- a/objects/obj_turn_end/Draw_0.gml +++ b/objects/obj_turn_end/Draw_0.gml @@ -15,180 +15,9 @@ if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite if (show>0) and (current_battle<=battles){ - var xxx,yyy,i; - xxx=__view_get( e__VW.XView, 0 )+535; - yyy=__view_get( e__VW.YView, 0 )+200; - i=current_battle; - - draw_sprite(spr_purge_panel,0,xxx,yyy); - // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); - // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); - if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174); - if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles))); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0); - - scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); - // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - - - - if (battle_world[i]<0){ - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Fleets:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allied Fleets:")); - - if (string(strin[1])="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleship ("+string(strin[4])+"% HP)")); - if (string(strin[2])="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigate ("+string(strin[5])+"% HP)")); - if (string(strin[3])="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escort ("+string(strin[6])+"% HP)")); - if (string(strin[1])!="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleships ("+string(strin[4])+"% HP)")); - if (string(strin[2])!="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigates ("+string(strin[5])+"% HP)")); - if (string(strin[3])!="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escorts ("+string(strin[6])+"% HP)")); - - - draw_set_halign(fa_center); - - if (enemy_fleet[1]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[1],xxx+44,yyy+269); - scr_image("ui/force",enemy_fleet[1],xxx+44-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[1]=1) then shw+=string(ecap[1])+" Battleship#"; - if (ecap[1]!=1) then shw+=string(ecap[1])+" Battleships#"; - if (efri[1]=1) then shw+=string(efri[1])+" Frigate#"; - if (efri[1]!=1) then shw+=string(efri[1])+" Frigates#"; - if (eesc[1]=1) then shw+=string(eesc[1])+" Escort#"; - if (eesc[1]!=1) then shw+=string(eesc[1])+" Escorts#"; - - draw_text_transformed(xxx+44,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[2]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[2],xxx+154,yyy+269); - scr_image("ui/force",enemy_fleet[2],xxx+154-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[2]=1) then shw+=string(ecap[2])+" Battleship#"; - if (ecap[2]!=1) then shw+=string(ecap[2])+" Battleships#"; - if (efri[2]=1) then shw+=string(efri[2])+" Frigate#"; - if (efri[2]!=1) then shw+=string(efri[2])+" Frigates#"; - if (eesc[2]=1) then shw+=string(eesc[2])+" Escort#"; - if (eesc[2]!=1) then shw+=string(eesc[2])+" Escorts#"; - - draw_text_transformed(xxx+154,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[3]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[3],xxx+264,yyy+269); - scr_image("ui/force",enemy_fleet[3],xxx+264-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[3]=1) then shw+=string(ecap[3])+" Battleship#"; - if (ecap[3]!=1) then shw+=string(ecap[3])+" Battleships#"; - if (efri[3]=1) then shw+=string(efri[3])+" Frigate#"; - if (efri[3]!=1) then shw+=string(efri[3])+" Frigates#"; - if (eesc[3]=1) then shw+=string(eesc[3])+" Escort#"; - if (eesc[3]!=1) then shw+=string(eesc[3])+" Escorts#"; - - draw_text_transformed(xxx+264,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - if (allied_fleet[1]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+374-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[1]=1) then shw+=string(acap[1])+" Battleship#"; - if (acap[1]!=1) then shw+=string(acap[1])+" Battleships#"; - if (afri[1]=1) then shw+=string(afri[1])+" Frigate#"; - if (afri[1]!=1) then shw+=string(afri[1])+" Frigates#"; - if (aesc[1]=1) then shw+=string(aesc[1])+" Escort#"; - if (aesc[1]!=1) then shw+=string(aesc[1])+" Escorts#"; - - draw_text_transformed(xxx+374,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (allied_fleet[2]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+484,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+484-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[2]=1) then shw+=string(acap[2])+" Battleship#"; - if (acap[2]!=1) then shw+=string(acap[2])+" Battleships#"; - if (afri[2]=1) then shw+=string(afri[2])+" Frigate#"; - if (afri[2]!=1) then shw+=string(afri[2])+" Frigates#"; - if (aesc[2]=1) then shw+=string(aesc[2])+" Escort#"; - if (aesc[2]!=1) then shw+=string(aesc[2])+" Escorts#"; - - draw_text_transformed(xxx+484,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - - - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Retreat"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Fight"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - } - + - if (battle_world[i]>=1){ - if (battle_opponent[i]<=20){ - draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Marines")); - draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Vehicles")); - if (strin[3]!="") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Fortified"));// Not / Barely / Lightly / Moderately / Highly / Maximally - } - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Factions:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allies:")); - - - - draw_set_halign(fa_center); - // draw_sprite(spr_force_icon,battle_opponent[i],xxx+44,yyy+289); - scr_image("ui/force",battle_opponent[i],xxx+44-32,yyy+289-32,64,64); - draw_text_transformed(xxx+44,yyy+316,string_hash_to_newline(string(strin[4])),0.75,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Offensive"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Defensive"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - - - - - } + } diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 6748fd8ad7..2a64a85a03 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -33,5 +33,43 @@ if (alerts>0) and (popups_end=1){ } } -draw_set_alpha(1); +main_slate.inside_method = function(){ + if (show>0 && current_battle<=battles && current_battle>-1){ + var xxx=main_slate.XX; + var yyy=main_slate.YY; + var i=current_battle; + + // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); + // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); + var _img = battle_world[i]==-50; + scr_image("attacked",_img,xxx+12,yyy+54,254,174); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_text(xxx+8,yyy+13,$"{i}/{battles}"); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})",0.7,0.7,0); + if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)",0.7,0.7,0); + + scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); + // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + if (battle_world[current_battle]<0){ + draw_player_fleet_combat_options(); + } else if (battle_world[i]>=1){ + draw_player_ground_combat_options(); + } + } + draw_set_alpha(1); +} + +if (show>0 && current_battle<=battles && current_battle>-1 ){ + main_slate.draw_with_dimensions(535, 200, 530, 400); +} diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index a7991417c1..fc5c36bb66 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -323,7 +323,27 @@ function ComplexSet(_unit) constructor { _overides = "none"; if (struct_exists(_mod, "overides")) { - _overides = _mod.overides; + _overides = {overides:_mod.overides}; + } + if (struct_exists(_mod, "offsets")){ + var _x = 0; + var _y = 0; + if (struct_exists(_mod.offsets,unit_armour)){ + var _offset = _mod.offsets[$ unit_armour]; + if (struct_exists(_offset,"x")){ + _x += _offset.x; + } + if (struct_exists(_offset,"y")){ + _x += _offset.y; + } + } + if (_x != 0 || _y !=0){ + if (_overides == "none"){ + _overides = {offsets:[_x, _y]}; + } else { + _overides.offsets = [_x, _y] + } + } } if (struct_exists(_mod, "subcomponents")){ @@ -418,10 +438,10 @@ function ComplexSet(_unit) constructor { } } } else { - add_to_area(_mod.position, _mod.sprite, _overides,_sub_comps); + add_to_area(_mod.position, _mod.sprite, _overides, _sub_comps); } if (struct_exists(_mod, "prevent_others")) { - replace_area(_mod.position, _mod.sprite, _overides,_sub_comps); + replace_area(_mod.position, _mod.sprite, _overides, _sub_comps); array_push(blocked, _mod.position); if (struct_exists(_mod, "ban")) { for (var b = 0; b < array_length(_mod.ban); b++) { @@ -496,6 +516,10 @@ function ComplexSet(_unit) constructor { if (struct_exists(self, component_name)) { var _sprite = self[$ component_name]; if (sprite_exists(_sprite)) { + + var _draw_x = x_surface_offset; + var _draw_y = y_surface_offset; + var choice = 0; var _map_choice = 3; if (struct_exists(variation_map, component_name)) { @@ -507,9 +531,18 @@ function ComplexSet(_unit) constructor { for (var i = 0; i < array_length(_overide_set); i++) { var _spec_over = _overide_set[i]; if (_spec_over[0] <= choice && _spec_over[1] > choice) { - var _override_areas = struct_get_names(_spec_over[2]); - for (var j = 0; j < array_length(_override_areas); j++) { - replace_area(_override_areas[j], _spec_over[2][$ _override_areas[j]]); + var _override_data = _spec_over[2]; + if (struct_exists(_override_data, "overides")){ + _override_areas = struct_get_names(_override_data.overides); + var _overs = _override_data.overides; + for (var j = 0; j < array_length(_override_areas); j++) { + replace_area(_override_areas[j], _overs[$ _override_areas[j]]); + } + } + if (struct_exists(_override_data, "offsets")){ + var _offsets = _override_data.offsets; + _draw_x += _offsets[0]; + _draw_y += _offsets[1]; } } } @@ -553,20 +586,20 @@ function ComplexSet(_unit) constructor { // show_debug_message($"{_tex_data.areas[t]}"); var _replace_col = shader_get_uniform(armour_texture, "replace_colour"); shader_set_uniform_f_array(_replace_col, _tex_data.areas[t]); - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); + draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); } } surface_reset_target(); surface_set_target(_return_surface); shader_set(full_livery_shader); - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); + draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); draw_surface(base_component_surface, 0, 0); surface_reset_target(); surface_clear_and_free(base_component_surface); surface_set_target(_return_surface); } else { - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); + draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); } if (struct_exists(subcomponents, component_name)) { var _subcomponents_found = false; @@ -592,7 +625,7 @@ function ComplexSet(_unit) constructor { for (var s=0;s -1){ if (_total_options == 0){ @@ -602,13 +635,13 @@ function ComplexSet(_unit) constructor { _sub_choice_final = _sub_choice % (_total_options+1); } - show_debug_message($"{_sub_choice_final}"); + //show_debug_message($"{_sub_choice_final}"); _choice_count = 0; for (var s=0;s= _choice_count && _sub_choice_final < _choice_count+sprite_get_number(_subcomponents[s])){ - show_debug_message($"{_sub_choice_final}, {_choice_count}"); - draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, x_surface_offset, y_surface_offset); + //show_debug_message($"{_sub_choice_final}, {_choice_count}"); + draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, _draw_x, _draw_y); break; } else { _choice_count += sprite_get_number(_subcomponents[s]); @@ -1298,6 +1331,11 @@ function ComplexSet(_unit) constructor { } }; + offsets=[]; + static add_offsets = function(area, _offset_start, sprite_length, overide_data){ + + } + static add_overide = function(area, _overide_start, sprite_length, overide_data) { if (!struct_exists(overides, area)) { overides[$ area] = []; diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 278dbc71d6..84c5c92410 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1270,7 +1270,35 @@ global.modular_drawing_items = [ equipped : { "gear" : "Combat Shield", }, - }, + }, + { + position : "right_eye", + sprite : spr_gear_apoth_eye, + role_type : [SPECIALISTS_APOTHECARIES], + offsets : { + "Terminator Armour":{ + y :-6, + }, + "Tartaros":{ + y :-6, + } + } + + }, + { + position : "backpack_decoration", + sprite : spr_gear_apoth, + role_type : [SPECIALISTS_APOTHECARIES], + offsets : { + "Terminator Armour":{ + y :- 22, + }, + "Tartaros":{ + y :- 30, + } + } + + } ]; diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index 926a7ef643..d23c1ab76e 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -380,16 +380,6 @@ function scr_draw_unit_image(_background = false) { armour_sprite = spr_weapon_blank; - - // Draw the lights - if ((unit_specialization == UnitSpecialization.Apothecary) && (unit_armour != "") && (back_equipment == BackType.None)) { - if (unit_armour == "Terminator Armour") { - draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 22); // for terminators - } else { - draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 6); - } // for normal power armour - } - // Draw Techmarine gear if ((servo_arm > 0 || servo_harness > 0) && (!arm_bypass)) { var arm_offset_y = 0; @@ -460,11 +450,10 @@ function scr_draw_unit_image(_background = false) { if (body.torso.robes == 0) { complex_set.add_to_area("robe", spr_marine_robes); } else if (body.torso.robes == 1) { - if (scr_has_disadv("Warp Tainted") && !modest_livery) { + if (scr_has_disadv("Warp Tainted")) { complex_set.add_to_area("robes", spr_binders_robes); - } else { - complex_set.add_to_area("robes", spr_marine_robes); } + complex_set.add_to_area("robes", spr_marine_robes); } else { complex_set.add_to_area("tabbard", spr_cloth_tabbard); } @@ -491,13 +480,6 @@ function scr_draw_unit_image(_background = false) { // Apothecary Details if (unit_specialization == UnitSpecialization.Apothecary) { - if (unit_armour == "Tartaros") { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); // was y_draw-4 with old tartar - } else if (unit_armour == "Terminator Armour") { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); - } else { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset); - } if (gear() == "Narthecium") { if (armour_type == ArmourType.Normal) { draw_sprite(spr_narthecium_2, 0, x_surface_offset + 66, y_surface_offset + 5); diff --git a/sprites/spr_gear_apoth/spr_gear_apoth.yy b/sprites/spr_gear_apoth/spr_gear_apoth.yy index 1e9544c73d..707bf0d30c 100644 --- a/sprites/spr_gear_apoth/spr_gear_apoth.yy +++ b/sprites/spr_gear_apoth/spr_gear_apoth.yy @@ -2,7 +2,7 @@ "$GMSprite":"v2", "%Name":"spr_gear_apoth", "bboxMode":0, - "bbox_bottom":44, + "bbox_bottom":41, "bbox_left":33, "bbox_right":129, "bbox_top":5, @@ -13,7 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -50,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":2.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -64,13 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","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/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png b/sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png similarity index 73% rename from sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png rename to sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png index 5d49b591024c01165e934d56a2cb0fcb473729c3..5edd5e96aa2c49ee4fa7c31e94f2d3ae3e36a5a1 100644 GIT binary patch delta 148 zcmcb{dX061H&eZ-u7QQFfoX`Lsg>4Ur?Zki@G~gOaGILXlOA>PnaO=?%kUz--)WqQF>gTe~DWM4fNZ%#C delta 148 zcmcb{dX061H&eZdu7Rblky(hLxs@pp8EP9CSQ!{h*?iRc?Mt yW?ChKk%19*4Nu?Ilmazqz%`U)=B5^xB<2?2*0bq%>?$6hCI(MeKbLh*2~7Zj":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_gear_apoth_eye", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","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, + "volume":1.0, + "xorigin":0, + "yorigin":11, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file From 34b5cc337805ee220298e9d661928b6165c3f061 Mon Sep 17 00:00:00 2001 From: Werwolf Date: Wed, 6 Aug 2025 22:53:26 +0200 Subject: [PATCH 03/13] eaa --- ChapterMaster.yyp | 4 + objects/obj_shop/Create_0.gml | 26 ++++- scripts/scr_ComplexSet/scr_ComplexSet.gml | 7 ++ .../scr_get_item_names/scr_get_item_names.gml | 5 +- .../scr_initialize_custom.gml | 1 + .../scr_reequip_units/scr_reequip_units.gml | 10 +- .../scr_ui_display_weapons.gml | 3 + .../scr_unit_equip_functions.gml | 2 +- scripts/scr_weapon/scr_weapon.gml | 61 ++++++++++++ .../8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png | Bin 0 -> 3246 bytes .../be470e13-bbeb-41d1-ae61-263c91abbae3.png | Bin 0 -> 3246 bytes .../spr_contemptor_CCW/spr_contemptor_CCW.yy | 92 ++++++++++++++++++ .../d55f9e41-41e0-43bd-b40c-86d963212769.png | Bin 0 -> 10643 bytes .../c511d01c-c558-46fa-b06f-82950d47dfc4.png | Bin 0 -> 10643 bytes .../spr_contemptor_chasis_colors.yy | 92 ++++++++++++++++++ .../74c01830-4218-44ae-aa3d-aba9109cecc2.png | Bin 0 -> 1083 bytes .../b113086c-f660-4cc2-bbdb-b89f64979d6b.png | Bin 0 -> 1083 bytes .../spr_contemptor_head_colors.yy | 92 ++++++++++++++++++ sprites/spr_dread_claw/spr_dread_claw.yy | 18 +++- .../spr_dread_iron_clad.yy | 18 +++- .../spr_dreadnought_chasis_colors.yy | 6 +- .../spr_dreadnought_decorations.yy | 14 ++- sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy | 6 +- .../d532989d-6b36-48dc-9ccb-1daf433cbb1f.png | Bin 0 -> 4878 bytes .../1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png | Bin 0 -> 4878 bytes .../spr_twl_Volkite_Culverins.yy | 92 ++++++++++++++++++ 26 files changed, 524 insertions(+), 25 deletions(-) create mode 100644 sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png create mode 100644 sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png create mode 100644 sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy create mode 100644 sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png create mode 100644 sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png create mode 100644 sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy create mode 100644 sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png create mode 100644 sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png create mode 100644 sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy create mode 100644 sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png create mode 100644 sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png create mode 100644 sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 09fa95f3cb..021b56fd55 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1105,6 +1105,9 @@ {"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},}, {"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, + {"id":{"name":"spr_contemptor_CCW","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},}, + {"id":{"name":"spr_contemptor_chasis_colors","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},}, + {"id":{"name":"spr_contemptor_head_colors","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},}, {"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},}, {"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},}, {"id":{"name":"spr_creation_check","path":"sprites/spr_creation_check/spr_creation_check.yy",},}, @@ -1651,6 +1654,7 @@ {"id":{"name":"spr_tooltip1","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},}, {"id":{"name":"spr_torpedo_board","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},}, {"id":{"name":"spr_torpedo","path":"sprites/spr_torpedo/spr_torpedo.yy",},}, + {"id":{"name":"spr_twl_Volkite_Culverins","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},}, {"id":{"name":"spr_ui_but_1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},}, {"id":{"name":"spr_ui_but_2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},}, {"id":{"name":"spr_ui_but_3","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},}, diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 8fa9d20615..fd20a76f1a 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -558,9 +558,8 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; - nobuy[i] = 1; - - i += 1; + nobuy[i] = 1; + i += 1; nobuy[i] = 1; item[i] = "Volkite Charger"; item_stocked[i] = scr_item_count(item[i]); @@ -659,7 +658,26 @@ if (shop = "equipment") { item_cost[i] = 0; forge_cost[i] = 0; i += 1; - + item[i] = "Contemptor Dreadnought"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + nobuy[i]=1 + i += 1; + nobuy[i]=1; + item[i] = "Twin-linked Volkite Culverins"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i]=1; + item[i] = "Contemptor CCW"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i]=1; + var mc = 0; repeat(i) { mc++; diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 1c108d09fd..6726fa9106 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1194,6 +1194,13 @@ function ComplexSet(_unit) constructor { }); armour_type = ArmourType.Dreadnought; break; + case "Contemptor Dreadnought": + add_group({ + armour: spr_contemptor_chasis_colors, + head: spr_contemptor_head_colors, + }); + armour_type = ArmourType.Dreadnought; + break; case "Scout Armour": add_group({ armour: spr_scout_complex, diff --git a/scripts/scr_get_item_names/scr_get_item_names.gml b/scripts/scr_get_item_names/scr_get_item_names.gml index da0793e12f..b321731631 100644 --- a/scripts/scr_get_item_names/scr_get_item_names.gml +++ b/scripts/scr_get_item_names/scr_get_item_names.gml @@ -150,7 +150,7 @@ function push_marine_mobility_item_names(_item_names) { /// @param {array} _item_names - The list to append to. /// @returns {void} function push_dreadnought_ranged_weapons_item_names(_item_names) { - var item_count = 10; + var item_count = 11; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -164,7 +164,8 @@ function push_dreadnought_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Twin Linked Lascannon"; _item_names[@ index++] = "Twin Linked Assault Cannon Mount"; _item_names[@ index++] = "Twin Linked Heavy Bolter"; - _item_names[@ index++] = "Heavy Conversion Beam Projector"; // 10 + _item_names[@ index++] = "Heavy Conversion Beam Projector"; + _item_names[@ index++] = "Twin-linked Volkite Culverins";// 10 } /// @description This function appends the list of dreadnought melee weapons to the given list. diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 624301a718..e38b38a20e 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1245,6 +1245,7 @@ function scr_initialize_custom() { devastator = devastator + real(s_val); break; case "dreadnought": + case "Contemptor Dreadnought": dreadnought = dreadnought + real(s_val); break; } diff --git a/scripts/scr_reequip_units/scr_reequip_units.gml b/scripts/scr_reequip_units/scr_reequip_units.gml index 078feb2125..2f3312daff 100644 --- a/scripts/scr_reequip_units/scr_reequip_units.gml +++ b/scripts/scr_reequip_units/scr_reequip_units.gml @@ -16,7 +16,7 @@ function set_up_equip_popup(){ if (vih==0){ if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - if (_unit.armour()!="Dreadnought"){ + if (_unit.armour()!="Dreadnought"&& _unit.armour != "Contemptor Dreadnought"){ vih=1; } else { vih=6; @@ -36,10 +36,10 @@ function set_up_equip_popup(){ break; } else if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - if (_unit.armour()=="Dreadnought" && vih==1){ + if (_unit.armour()!="Dreadnought"&& _unit.armour != "Contemptor Dreadnought" && vih==1){ allow=false; break; - } else if (_unit.armour()!="Dreadnought" && vih==6){ + } else if (_unit.armour()!="Dreadnought"&& _unit.armour != "Contemptor Dreadnought" && vih==6){ allow=false; break; } @@ -627,7 +627,7 @@ function draw_popup_equip(){ warning = "Not enough " + string(n_gear) + "; " + string(units - req_gear_num) + " more are required."; } - if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0)) { + if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0) && (string_count("Contemptor Dreadnought", n_armour) > 0)) { n_good4 = 0; warning = "Dreadnoughts may not use infantry equipment."; } @@ -660,7 +660,7 @@ function draw_popup_equip(){ warning = "Cannot use this gear with Terminator Armour."; } - if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought")) { + if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought") && (n_armour == "Contemptor Dreadnought")) { n_good5 = 0; warning = string(obj_ini.role[100][6]) + "s may not use mobility gear."; } diff --git a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml index 250a1b7736..6e55042f90 100644 --- a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml +++ b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml @@ -189,6 +189,9 @@ function dreadnought_sprite_components(component){ "Multi-Melta": spr_dread_plasma_cannon, "Twin Linked Lascannon": spr_dread_lascannon, "Heavy Conversion Beam Projector": spr_dread_plasma_cannon, + "Twin-linked Volkite Culverins":spr_twl_Volkite_Culverins, + "Contemptor CCW":spr_contemptor_CCW, + }; if (struct_exists(components, component)){ return components[$ component] diff --git a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml index 23386f8a3d..7a1f04fd28 100644 --- a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml +++ b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml @@ -110,7 +110,7 @@ function scr_update_unit_armour(new_armour, from_armoury = true, to_armoury = tr } } - if (armour() == "Dreadnought") { + if (armour() == "Dreadnought" ) { is_boarder = false; update_gear(""); update_mobility_item(""); diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 2c7e1ebaf7..33479c14af 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -65,6 +65,22 @@ global.weapons = { "arp": 0, "tags": ["Volkite", "energy", "pistol"] }, + "Twin-linked Volkite Culverins":{ + "abbreviation": "T-LVolkCulv", + "attack": { + "standard": 250, + "master_crafted": 270, + "artifact": 290 + }, + "description": "The pistol variant of the long-lost Volkite weapon type, the Serpenta was a mainstay of Moritats and often wielded by Centurions of the Legiones Astartes. Now a symbol of status to match its fearsome potency, a sighting of this ancient weapon would send many foes running.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 10, + "range": 3, + "spli": 4, + "arp": 0, + "tags": ["Volkite", "energy", "dreadnought"] + }, //Bolt Pack "Phobos Bolt Pistol": { "abbreviation": "PhBltPis", @@ -715,6 +731,28 @@ global.weapons = { "maintenance" : 0.1, "tags": ["power", "vehicle", "dual", "dreadnought", "fist"], }, + "Contemptor CCW": { + "abbreviation": "ConCCW", + "attack": { + "standard": 300, + "master_crafted": 400, + "artifact": 600 + }, + "melee_mod": { + "standard": 1.2, + "master_crafted": 1.2, + "artifact": 1.2 + }, + "description": "A specialized Lightning Claw variant designed for Dreadnoughts, these claws are capable of ripping through enemy vehicles and infantry with ease.", + "melee_hands": 5, + "ranged_hands": 0, + "ammo": 0, + "range": 1, + "spli": 15, + "arp": 1, + "maintenance" : 0.1, + "tags": ["power", "dual", "dreadnought", "fist"], + }, "Thunder Hammer": { "abbreviation": "ThndHmr", "attack": { @@ -2276,6 +2314,29 @@ global.gear = { "tags": ["dreadnought"], "maintenance" : 1, }, + "Contemptor Dreadnought": { + "abbreviation": "Drdnght", + "armour_value": { + "standard": 50, + "master_crafted": 55, + "artifact": 60 + }, + "ranged_mod": { + "standard": 0, + "master_crafted": 5, // Augmented + "artifact": 10 // Augmented + }, + "melee_mod": { + "standard": 0, + "master_crafted": 5, // Augmented + "artifact": 10 // Augmented + }, + "melee_hands": 8, + "ranged_hands": 8, + "description": "PLACEHOLDER", + "tags": ["dreadnought"], + "maintenance" : 1, + }, "Tartaros": { "abbreviation": "Tartrs", "armour_value": { diff --git a/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png b/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png new file mode 100644 index 0000000000000000000000000000000000000000..d0f4a7d1051064ae533a15fc4d3246f712efee5c GIT binary patch literal 3246 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_CCW", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e2b8255-80d9-44fb-90a8-fd804243ca38","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png b/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png new file mode 100644 index 0000000000000000000000000000000000000000..0dbe722fa36abc24af4620e2082e9d4bc3748abe GIT binary patch literal 10643 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 A-2eap literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png b/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png new file mode 100644 index 0000000000000000000000000000000000000000..0dbe722fa36abc24af4620e2082e9d4bc3748abe GIT binary patch literal 10643 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 A-2eap literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy b/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy new file mode 100644 index 0000000000..77b1b3efe9 --- /dev/null +++ b/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_chasis_colors", + "bboxMode":0, + "bbox_bottom":249, + "bbox_left":72, + "bbox_right":243, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d55f9e41-41e0-43bd-b40c-86d963212769","name":"d55f9e41-41e0-43bd-b40c-86d963212769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c511d01c-c558-46fa-b06f-82950d47dfc4","blendMode":0,"displayName":"default","isLocked":false,"name":"c511d01c-c558-46fa-b06f-82950d47dfc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_chasis_colors", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_contemptor_chasis_colors", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_chasis_colors", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"d55f9e41-41e0-43bd-b40c-86d963212769","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84faeb3a-e305-44d2-80c7-0e9bacc81e82","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png b/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png new file mode 100644 index 0000000000000000000000000000000000000000..1adb1412918757424e86830a0c8f0f051a9f0852 GIT binary patch literal 1083 zcmeAS@N?(olHy`uVBq!ia0y~yU^D`14Ba#P!1^6 z@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2Y)RhkE)4%caKYZ?lNlJ8^*mi1Ln>~)z2lpA zIY5H-!s{(s1`V3RGtwn*dR}`VdL`1U{mr7?3eGIb%M2V84)Dk<_xl`t*`g?Fu5e`8 zlkYd{CYApF^h$*hXgGfG;H2iUeGK#VDxJJPFIV03)kggp%byp$;eK#)m&d2wH`nBE zE7vcZ5|aBMR_&*88GD6Q&k2jx)hhPo>=D_83--)XublYg`VHBKnF1+1FLEc=tet#? z-6`kZnrn{RmdBd<2bJ`3R&yG)ZPP#UYj8hrk;gwW}km0oW#G?H2j!j+gqNcvb|q<*17IaJ886XS>gJk20=;Z9T98o zpV|wpYImK)|NR_e^q;B89P207WShOtn-Ke6-*QIz+_|CEJ?5VK`tJswo2-z`Q9bXT zy+~HH<2LO*yKKJl&pC2hMf3D0BTw7aulhY-ebv6Zbls#~`=VF93(DQ{_DcBXXERn8 zuQ|_YFy;G8mJ4AMu6}o3E1mY;DaYSeI%V$DyEo=O`!nOsbBXzk4qNL*@tva<_7whmy2FsUAei8FK6RC{?{z`wGK=Q z?KtSnBDvhacaqtKsO_PKZ(Aa73A|>x?q>T%^@PRJUWZwsUq9)ck-FR8{~2OC7#SFu>Ka(+8kmL{npl}wTA3JV8yHv_7%aTo z^BF}$ZhlH;S|x4`7aC0bff_X6Hk4%MrWThZ<`&@A(>_&n0w~BmUHx3vIVCg!0OU1a AQvd(} literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png b/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png new file mode 100644 index 0000000000000000000000000000000000000000..1adb1412918757424e86830a0c8f0f051a9f0852 GIT binary patch literal 1083 zcmeAS@N?(olHy`uVBq!ia0y~yU^D`14Ba#P!1^6 z@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2Y)RhkE)4%caKYZ?lNlJ8^*mi1Ln>~)z2lpA zIY5H-!s{(s1`V3RGtwn*dR}`VdL`1U{mr7?3eGIb%M2V84)Dk<_xl`t*`g?Fu5e`8 zlkYd{CYApF^h$*hXgGfG;H2iUeGK#VDxJJPFIV03)kggp%byp$;eK#)m&d2wH`nBE zE7vcZ5|aBMR_&*88GD6Q&k2jx)hhPo>=D_83--)XublYg`VHBKnF1+1FLEc=tet#? z-6`kZnrn{RmdBd<2bJ`3R&yG)ZPP#UYj8hrk;gwW}km0oW#G?H2j!j+gqNcvb|q<*17IaJ886XS>gJk20=;Z9T98o zpV|wpYImK)|NR_e^q;B89P207WShOtn-Ke6-*QIz+_|CEJ?5VK`tJswo2-z`Q9bXT zy+~HH<2LO*yKKJl&pC2hMf3D0BTw7aulhY-ebv6Zbls#~`=VF93(DQ{_DcBXXERn8 zuQ|_YFy;G8mJ4AMu6}o3E1mY;DaYSeI%V$DyEo=O`!nOsbBXzk4qNL*@tva<_7whmy2FsUAei8FK6RC{?{z`wGK=Q z?KtSnBDvhacaqtKsO_PKZ(Aa73A|>x?q>T%^@PRJUWZwsUq9)ck-FR8{~2OC7#SFu>Ka(+8kmL{npl}wTA3JV8yHv_7%aTo z^BF}$ZhlH;S|x4`7aC0bff_X6Hk4%MrWThZ<`&@A(>_&n0w~BmUHx3vIVCg!0OU1a AQvd(} literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy b/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy new file mode 100644 index 0000000000..c2ae9398f7 --- /dev/null +++ b/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_head_colors", + "bboxMode":0, + "bbox_bottom":47, + "bbox_left":143, + "bbox_right":172, + "bbox_top":29, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"74c01830-4218-44ae-aa3d-aba9109cecc2","name":"74c01830-4218-44ae-aa3d-aba9109cecc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","blendMode":0,"displayName":"default","isLocked":false,"name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_head_colors", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_contemptor_head_colors", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_head_colors", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"74c01830-4218-44ae-aa3d-aba9109cecc2","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"54d5695e-8560-4098-8bd1-1686b108adbb","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_dread_claw/spr_dread_claw.yy b/sprites/spr_dread_claw/spr_dread_claw.yy index a959601858..761f0f75bb 100644 --- a/sprites/spr_dread_claw/spr_dread_claw.yy +++ b/sprites/spr_dread_claw/spr_dread_claw.yy @@ -66,15 +66,25 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.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/spr_dread_iron_clad/spr_dread_iron_clad.yy b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy index 193f8faabf..2d8280e01f 100644 --- a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy +++ b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy @@ -67,15 +67,25 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.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/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy index b70a168864..c2897e614c 100644 --- a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy +++ b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy @@ -64,12 +64,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","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/spr_dreadnought_decorations/spr_dreadnought_decorations.yy b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy index 85357e3a03..084ec74435 100644 --- a/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy +++ b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy @@ -65,14 +65,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.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/spr_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy index b8a251d175..f33cbde28f 100644 --- a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy +++ b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","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/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png b/sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png new file mode 100644 index 0000000000000000000000000000000000000000..78ae7850ce221d89cd38975f2fcce7baa0a28d89 GIT binary patch literal 4878 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 ay>PCN|Fce1ipZ;faYE@D>X5Xp!~O?}eGgRt literal 0 HcmV?d00001 diff --git a/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png b/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png new file mode 100644 index 0000000000000000000000000000000000000000..78ae7850ce221d89cd38975f2fcce7baa0a28d89 GIT binary patch literal 4878 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 ay>PCN|Fce1ipZ;faYE@D>X5Xp!~O?}eGgRt literal 0 HcmV?d00001 diff --git a/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy b/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy new file mode 100644 index 0000000000..5d386c8d61 --- /dev/null +++ b/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_twl_Volkite_Culverins", + "bboxMode":0, + "bbox_bottom":173, + "bbox_left":203, + "bbox_right":287, + "bbox_top":77, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","blendMode":0,"displayName":"default","isLocked":false,"name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_twl_Volkite_Culverins", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_twl_Volkite_Culverins", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_twl_Volkite_Culverins", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a3b8ccb-c022-4cad-95b2-9d1f0d2d8c12","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file From 46b64ed28e2c8ddcbc41a948cb33219f29d9e3e6 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 6 Aug 2025 22:40:00 +0100 Subject: [PATCH 04/13] fix dread finding --- .../scr_apothecary_ground.gml | 2 +- .../scr_draw_unit_image.gml | 34 +++++++++---------- .../scr_initialize_custom.gml | 2 +- .../scr_marine_struct/scr_marine_struct.gml | 12 ++++++- .../scr_reequip_units/scr_reequip_units.gml | 17 ++++------ scripts/scr_roster/scr_roster.gml | 9 ++--- scripts/scr_ui_settings/scr_ui_settings.gml | 2 +- .../scr_unit_equip_functions.gml | 2 +- .../spr_gear_combat_shield.yy | 10 ++++-- .../spr_helm_decorations.yy | 10 ++++-- 10 files changed, 58 insertions(+), 42 deletions(-) diff --git a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml index 1b6b871564..50df4e8392 100644 --- a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml +++ b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml @@ -233,7 +233,7 @@ function apothecary_simple(){ } else if (is_struct(_unit)){ _loc_forge_points -= _unit.equipment_maintenance_burden(); if (_unit.hp() < _unit.max_health()){ - if (_unit.armour() != "Dreadnought"){ + if (!_unit.is_dreadnought()){ if (_unit.hp()>0){ if (_loc_heal_points >0){ if (turn_end){ diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index 5b7f495641..557a1aa2dc 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -329,23 +329,23 @@ function scr_draw_unit_image(_background = false) { halo = 1; } - switch (unit_armour) { - case "Scout Armour": - armour_type = ArmourType.Scout; - break; - case "Terminator Armour": - case "Tartaros": - armour_type = ArmourType.Terminator; - break; - case "Dreadnought": - case "Contemptor Dreadnought": - armour_type = ArmourType.Dreadnought; - break; - case ITEM_NAME_NONE: - case "": - case "None": - armour_type = ArmourType.None; - break; + if (is_dreadnought()){ + armour_type = ArmourType.Dreadnought; + } else { + switch (unit_armour) { + case "Scout Armour": + armour_type = ArmourType.Scout; + break; + case "Terminator Armour": + case "Tartaros": + armour_type = ArmourType.Terminator; + break; + case ITEM_NAME_NONE: + case "": + case "None": + armour_type = ArmourType.None; + break; + } } draw_backpack = armour_type == ArmourType.Normal; diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index e38b38a20e..550e5dfd54 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1418,7 +1418,7 @@ function scr_initialize_custom() { load_default_gear(eROLE.Veteran, "Veteran", "Combiflamer", "Combat Knife",STR_ANY_POWER_ARMOUR, "", ""); load_default_gear(eROLE.Terminator, "Terminator", "Power Fist", "Storm Bolter", "Terminator Armour", "", ""); load_default_gear(eROLE.Captain, "Captain", "Power Sword", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", "Iron Halo"); - load_default_gear(eROLE.Dreadnought, "Dreadnought", "Close Combat Weapon", "Lascannon", "Dreadnought", "", ""); + load_default_gear(eROLE.Dreadnought, "Dreadnought", "Close Combat Weapon", "Lascannon", "Contemptor Dreadnought", "", ""); load_default_gear(eROLE.Champion, "Champion", "Power Sword", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", "Combat Shield"); load_default_gear(eROLE.Tactical, "Tactical", "Bolter", "Combat Knife", STR_ANY_POWER_ARMOUR, "", ""); load_default_gear(eROLE.Devastator, "Devastator", "", "Combat Knife", STR_ANY_POWER_ARMOUR, "", ""); diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 5d81409d9b..cc5dece659 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -2341,8 +2341,18 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } }; + static is_dreadnought = function(){ + _arm_data = get_armour_data(); + if (is_struct(_arm_data)){ + if (_arm_data.has_tag("dreadnought")){ + return true + } + } + return false; + } + /// @param {Enum.EquipmentSlot} _slot - add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { + static add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { var _slots = array_create(0); switch (_slot) { diff --git a/scripts/scr_reequip_units/scr_reequip_units.gml b/scripts/scr_reequip_units/scr_reequip_units.gml index 2f3312daff..121f68da8d 100644 --- a/scripts/scr_reequip_units/scr_reequip_units.gml +++ b/scripts/scr_reequip_units/scr_reequip_units.gml @@ -16,11 +16,7 @@ function set_up_equip_popup(){ if (vih==0){ if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - if (_unit.armour()!="Dreadnought"&& _unit.armour != "Contemptor Dreadnought"){ - vih=1; - } else { - vih=6; - } + vih = _unit.is_dreadnought() ? 6 : 1; } else if (man[f]=="vehicle"){ if (ma_role[f]=="Land Raider") { vih=50;} else if (ma_role[f]=="Rhino") { vih=51;} @@ -36,12 +32,13 @@ function set_up_equip_popup(){ break; } else if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - if (_unit.armour()!="Dreadnought"&& _unit.armour != "Contemptor Dreadnought" && vih==1){ - allow=false; - break; - } else if (_unit.armour()!="Dreadnought"&& _unit.armour != "Contemptor Dreadnought" && vih==6){ + var _is_dread = _unit.is_dreadnought(); + if (_is_dread && vih==1){ + allow=false; + break; + } else if (!_is_dread && vih == 6){ allow=false; - break; + break; } } } else if (vih>=50){ diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index 68be5a41cf..84c57c64eb 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -278,12 +278,9 @@ function Roster() constructor{ } } else { if (!array_contains(_squads, "dreadnought")){ - var _armour_data = _unit.get_armour_data(); - if (is_struct(_armour_data)){ - if (_armour_data.has_tag("dreadnought")){ - array_push(_squads, "dreadnought"); - new_squad_button("Dreadnought", "dreadnought"); - } + if (_unit.is_dreadnought()){ + array_push(_squads, "dreadnought"); + new_squad_button("Dreadnought", "dreadnought"); } } } diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index 75d466af9a..e86c4e1648 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -380,7 +380,7 @@ function scr_ui_settings() { draw_rectangle(x5, y5, x5 - string_width(title), y5 + string_height(title) - 2, 0); var nep = false; - + if (((obj_ini.armour[co, ide] == "Terminator Armour") || (obj_ini.armour[co, ide] == "Dreadnought")) && (gg == 4)) { nep = true; } diff --git a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml index 7a1f04fd28..a49a67206a 100644 --- a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml +++ b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml @@ -110,7 +110,7 @@ function scr_update_unit_armour(new_armour, from_armoury = true, to_armoury = tr } } - if (armour() == "Dreadnought" ) { + if (new_arm_data.has_tag("dreadnought")) { is_boarder = false; update_gear(""); update_mobility_item(""); diff --git a/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy index b2cb38250e..c6dbba13d5 100644 --- a/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy +++ b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy @@ -64,13 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fdba72c1-79cb-494b-9323-35263132441a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.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/spr_helm_decorations/spr_helm_decorations.yy b/sprites/spr_helm_decorations/spr_helm_decorations.yy index be5026ea12..b0907d4a89 100644 --- a/sprites/spr_helm_decorations/spr_helm_decorations.yy +++ b/sprites/spr_helm_decorations/spr_helm_decorations.yy @@ -64,13 +64,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.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":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_helm_decorations/spr_helm_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.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, From c53098610901e9586ead1a34c36bc76075378bc8 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 7 Aug 2025 01:48:31 +0100 Subject: [PATCH 05/13] contemptor weapons fixed --- scripts/scr_ComplexSet/scr_ComplexSet.gml | 12 ++ .../scr_culture_visuals.gml | 164 +++++++++++++++++- .../scr_draw_unit_image.gml | 36 ++-- .../scr_initialize_custom.gml | 2 +- .../scr_reequip_units/scr_reequip_units.gml | 4 +- 5 files changed, 191 insertions(+), 27 deletions(-) diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 1d1d692622..61243fd919 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -743,6 +743,18 @@ function ComplexSet(_unit) constructor { }; static draw_weapon_and_hands = function() { + if (armour_type == ArmourType.Dreadnought){ + show_debug_message("dread weapons"); + if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { + draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); + show_debug_message("dread right"); + } + if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite)) { + draw_sprite(weapon_left.sprite, 0, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); + show_debug_message("dread left"); + } + exit; + } // Draw hands bellow the weapon sprite; if (!weapon_right.ui_twoh && !weapon_left.ui_twoh) { for (var i = 0; i <= 1; i++) { diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 84c5c92410..0656451694 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1792,6 +1792,11 @@ base: { }, variants : [{ sprite: spr_weapon_assca, + }, + { + sprite: spr_weapon_assca, + body_types: [3], + armours : ["Dreadnought"], }], }, "Heavy Flamer": { @@ -1822,9 +1827,97 @@ base: { variants: [ { sprite: spr_weapon_lasca, + }, + { + sprite: spr_dread_plasma_cannon, + body_types: [3], + armours : ["Dreadnought"], } ], }, +"Close Combat Weapon" : { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + armours : ["Dreadnought"], + }, + variants: [ + { + sprite: spr_dread_claw, + }, + { + sprite: spr_contemptor_CCW, + armours : ["Contemptor Dreadnought"], + } + ] +}, +"Twin Linked Heavy Bolter" : { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_heavy_bolter, + } + ] +}, +"Dreadnought Lightning Claw": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_claw, + } + ] +}, +"CCW Heavy Flamer": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_claw, + } + ] +}, +"Dreadnought Power Claw": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_claw, + } + ] +}, +"Inferno Cannon": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_plasma_cannon, + } + ] +}, "Multi-Melta" : { base: { body_types: [0, 1], @@ -1835,9 +1928,53 @@ base: { variants: [ { sprite: spr_weapon_mmelta, - } + }, + { + sprite: spr_dread_plasma_cannon, + body_types: [3], + armours : ["Dreadnought"], + } ], }, +"Twin Linked Lascannon": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_lascannon, + } + ] +}, +"Heavy Conversion Beam Projector":{ + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_plasma_cannon, + } + ] +}, +"Twin-linked Volkite Culverins":{ + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_twl_Volkite_Culverins, + } + ] +}, "Bolt Pistol": { base: { weapon_data: { @@ -1847,7 +1984,7 @@ base: { }, variants: [{ sprite: spr_weapon_boltpis, - }] + }], }, "Infernus Pistol": { @@ -2037,9 +2174,16 @@ base: { new_weapon_draw: true }, }, - variants: [{ - sprite: spr_weapon_missile, - }] + variants: [ + { + sprite: spr_weapon_missile, + }, + { + sprite: spr_dread_missile, + body_types: [3], + armours : ["Dreadnought"], + } + ] }, "Plasma Cannon": { base: { @@ -2058,6 +2202,11 @@ base: { }, sprite: spr_weapon_plasc, body_types: [0, 1] + }, + { + sprite: spr_dread_plasma_cannon, + body_types: [3], + armours : ["Dreadnought"], } ] }, @@ -2237,6 +2386,11 @@ base: { variants: [ { sprite: spr_weapon_autocannon2 + }, + { + sprite: spr_dread_autocannon, + body_types: [3], + armours : ["Dreadnought"], } ] }, diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index ee4bf42dbb..058dbf4a31 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -330,24 +330,20 @@ function scr_draw_unit_image(_background = false) { if (is_dreadnought()){ armour_type = ArmourType.Dreadnought; } else { - switch (unit_armour) { - case "Scout Armour": - armour_type = ArmourType.Scout; - break; - case "Terminator Armour": - case "Tartaros": - case "Cataphractii": - armour_type = ArmourType.Terminator; - break; - case "Dreadnought": - case "Contemptor Dreadnought": - armour_type = ArmourType.Dreadnought; - break; - case ITEM_NAME_NONE: - case "": - case "None": - armour_type = ArmourType.None; - break; + switch (unit_armour) { + case "Scout Armour": + armour_type = ArmourType.Scout; + break; + case "Terminator Armour": + case "Tartaros": + case "Cataphractii": + armour_type = ArmourType.Terminator; + break; + case ITEM_NAME_NONE: + case "": + case "None": + armour_type = ArmourType.None; + break; } } @@ -494,14 +490,14 @@ function scr_draw_unit_image(_background = false) { } } // if (reverent_guardians=1) then draw_sprite(spr_pack_brazier,1,x_surface_offset,y_surface_offset); - if (armour_type == ArmourType.Dreadnought) { + /*if (armour_type == ArmourType.Dreadnought) { var left_arm = dreadnought_sprite_components(weapon_two()); var colour_scheme = specialist_colours <= 1 ? 0 : 1; draw_sprite(left_arm, colour_scheme, x_surface_offset, y_surface_offset); colour_scheme += 2; var right_arm = dreadnought_sprite_components(weapon_one()); draw_sprite(right_arm, colour_scheme, x_surface_offset, y_surface_offset); - } + }* /*}else{ draw_set_color(c_gray); draw_text(0,0,string_hash_to_newline("Color swap shader#did not compile")); diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 550e5dfd54..e38b38a20e 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1418,7 +1418,7 @@ function scr_initialize_custom() { load_default_gear(eROLE.Veteran, "Veteran", "Combiflamer", "Combat Knife",STR_ANY_POWER_ARMOUR, "", ""); load_default_gear(eROLE.Terminator, "Terminator", "Power Fist", "Storm Bolter", "Terminator Armour", "", ""); load_default_gear(eROLE.Captain, "Captain", "Power Sword", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", "Iron Halo"); - load_default_gear(eROLE.Dreadnought, "Dreadnought", "Close Combat Weapon", "Lascannon", "Contemptor Dreadnought", "", ""); + load_default_gear(eROLE.Dreadnought, "Dreadnought", "Close Combat Weapon", "Lascannon", "Dreadnought", "", ""); load_default_gear(eROLE.Champion, "Champion", "Power Sword", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", "Combat Shield"); load_default_gear(eROLE.Tactical, "Tactical", "Bolter", "Combat Knife", STR_ANY_POWER_ARMOUR, "", ""); load_default_gear(eROLE.Devastator, "Devastator", "", "Combat Knife", STR_ANY_POWER_ARMOUR, "", ""); diff --git a/scripts/scr_reequip_units/scr_reequip_units.gml b/scripts/scr_reequip_units/scr_reequip_units.gml index 7ccd668f01..04ac7e9e15 100644 --- a/scripts/scr_reequip_units/scr_reequip_units.gml +++ b/scripts/scr_reequip_units/scr_reequip_units.gml @@ -18,7 +18,9 @@ function set_up_equip_popup(){ if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; vih = _unit.is_dreadnought() ? 6 : 1; - _unchangeable_armour = true; + if (vih == 6){ + _unchangeable_armour = true; + } } else if (man[f]=="vehicle"){ if (ma_role[f]=="Land Raider") { vih=50;} else if (ma_role[f]=="Rhino") { vih=51;} From 01c15f38b6857aa236abb479abd763a78cc941b7 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 7 Aug 2025 15:19:16 +0100 Subject: [PATCH 06/13] Revert "Merge branch 'Contemptor'" This reverts commit e1b15afa69103afd6115c0ca68c842654298455b, reversing changes made to ce48b3834b1da594b11dd7c8c1c6e76b12d17539. --- ChapterMaster.yyp | 7 - objects/obj_shop/Create_0.gml | 26 +- objects/obj_turn_end/Draw_0.gml | 175 +++++- objects/obj_turn_end/Draw_64.gml | 40 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 574 ++++++++---------- .../scr_apothecary_ground.gml | 2 +- .../scr_culture_visuals.gml | 221 +------ .../scr_draw_unit_image.gml | 166 ++++- .../scr_get_item_names/scr_get_item_names.gml | 5 +- .../scr_initialize_custom.gml | 1 - .../scr_marine_struct/scr_marine_struct.gml | 12 +- .../scr_reequip_units/scr_reequip_units.gml | 25 +- scripts/scr_roster/scr_roster.gml | 9 +- .../scr_ui_display_weapons.gml | 3 - scripts/scr_ui_settings/scr_ui_settings.gml | 2 +- .../scr_unit_equip_functions.gml | 2 +- scripts/scr_weapon/scr_weapon.gml | 61 -- .../0ca30034-8ae6-44ea-ab2a-6277d1920908.png | Bin 868 -> 0 bytes .../587d63a4-32c8-4617-9c28-59a8a099c2c1.png | Bin 1107 -> 0 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 868 -> 0 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 1107 -> 0 bytes .../spr_combat_shield_bottom_part.yy | 96 --- .../8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png | Bin 3246 -> 0 bytes .../be470e13-bbeb-41d1-ae61-263c91abbae3.png | Bin 3246 -> 0 bytes .../spr_contemptor_CCW/spr_contemptor_CCW.yy | 92 --- .../d55f9e41-41e0-43bd-b40c-86d963212769.png | Bin 10643 -> 0 bytes .../c511d01c-c558-46fa-b06f-82950d47dfc4.png | Bin 10643 -> 0 bytes .../spr_contemptor_chasis_colors.yy | 92 --- .../74c01830-4218-44ae-aa3d-aba9109cecc2.png | Bin 1083 -> 0 bytes .../b113086c-f660-4cc2-bbdb-b89f64979d6b.png | Bin 1083 -> 0 bytes .../spr_contemptor_head_colors.yy | 92 --- sprites/spr_dread_claw/spr_dread_claw.yy | 18 +- .../spr_dread_iron_clad.yy | 18 +- .../spr_dreadnought_chasis_colors.yy | 6 +- .../spr_dreadnought_decorations.yy | 14 +- .../3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png} | Bin .../db192a8c-3604-4553-bea9-59dc5e18b44c.png} | Bin 726 -> 726 bytes sprites/spr_gear_apoth/spr_gear_apoth.yy | 12 +- .../spr_gear_apoth_eye/spr_gear_apoth_eye.yy | 92 --- .../350bde68-1664-48e8-97c4-7cff3c59b4ae.png | Bin 1596 -> 1971 bytes .../587d63a4-32c8-4617-9c28-59a8a099c2c1.png | Bin 2292 -> 2685 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 1596 -> 1971 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 2292 -> 2685 bytes sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy | 6 +- .../3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png | Bin 555 -> 0 bytes .../61531cde-cd44-4806-ae39-3c63f51d65de.png | Bin 520 -> 0 bytes .../4ff43f57-b34a-4219-8298-0399265c623b.png | Bin 555 -> 0 bytes .../4ff43f57-b34a-4219-8298-0399265c623b.png | Bin 520 -> 0 bytes .../a4c8b294-e4be-4fef-8912-4d706c9cec44.png | Bin 575 -> 0 bytes .../b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png | Bin 468 -> 0 bytes .../d292644f-2a3b-4981-868a-a423161e3739.png | Bin 468 -> 0 bytes sprites/spr_sgt_forehead/spr_sgt_forehead.yy | 96 --- .../d532989d-6b36-48dc-9ccb-1daf433cbb1f.png | Bin 4878 -> 0 bytes .../1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png | Bin 4878 -> 0 bytes .../spr_twl_Volkite_Culverins.yy | 92 --- 55 files changed, 616 insertions(+), 1441 deletions(-) delete mode 100644 sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png delete mode 100644 sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png delete mode 100644 sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png delete mode 100644 sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png delete mode 100644 sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy delete mode 100644 sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png delete mode 100644 sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png delete mode 100644 sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy delete mode 100644 sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png delete mode 100644 sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png delete mode 100644 sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy delete mode 100644 sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png delete mode 100644 sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png delete mode 100644 sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy rename sprites/{spr_gear_apoth_eye/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png => spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png} (100%) rename sprites/{spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png => spr_gear_apoth/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png} (73%) delete mode 100644 sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy delete mode 100644 sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png delete mode 100644 sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png delete mode 100644 sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png delete mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png delete mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png delete mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png delete mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png delete mode 100644 sprites/spr_sgt_forehead/spr_sgt_forehead.yy delete mode 100644 sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png delete mode 100644 sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png delete mode 100644 sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index c0f521d007..09fa95f3cb 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1103,12 +1103,8 @@ {"id":{"name":"spr_clothing_colors","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},}, {"id":{"name":"spr_cm_specialty","path":"sprites/spr_cm_specialty/spr_cm_specialty.yy",},}, {"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},}, - {"id":{"name":"spr_combat_shield_bottom_part","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},}, {"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, - {"id":{"name":"spr_contemptor_CCW","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},}, - {"id":{"name":"spr_contemptor_chasis_colors","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},}, - {"id":{"name":"spr_contemptor_head_colors","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},}, {"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},}, {"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},}, {"id":{"name":"spr_creation_check","path":"sprites/spr_creation_check/spr_creation_check.yy",},}, @@ -1206,7 +1202,6 @@ {"id":{"name":"spr_formation_splash","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},}, {"id":{"name":"spr_fur_tabbard","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},}, {"id":{"name":"spr_fur_tail_topknot","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},}, - {"id":{"name":"spr_gear_apoth_eye","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},}, {"id":{"name":"spr_gear_apoth","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},}, {"id":{"name":"spr_gear_chap","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},}, {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},}, @@ -1539,7 +1534,6 @@ {"id":{"name":"spr_servo_harness","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},}, {"id":{"name":"spr_settings_bg","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},}, {"id":{"name":"spr_settings_button","path":"sprites/spr_settings_button/spr_settings_button.yy",},}, - {"id":{"name":"spr_sgt_forehead","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},}, {"id":{"name":"spr_ship_aconite","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},}, {"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},}, {"id":{"name":"spr_ship_apoc","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},}, @@ -1657,7 +1651,6 @@ {"id":{"name":"spr_tooltip1","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},}, {"id":{"name":"spr_torpedo_board","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},}, {"id":{"name":"spr_torpedo","path":"sprites/spr_torpedo/spr_torpedo.yy",},}, - {"id":{"name":"spr_twl_Volkite_Culverins","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},}, {"id":{"name":"spr_ui_but_1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},}, {"id":{"name":"spr_ui_but_2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},}, {"id":{"name":"spr_ui_but_3","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},}, diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index fd20a76f1a..8fa9d20615 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -558,8 +558,9 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; - nobuy[i] = 1; - i += 1; + nobuy[i] = 1; + + i += 1; nobuy[i] = 1; item[i] = "Volkite Charger"; item_stocked[i] = scr_item_count(item[i]); @@ -658,26 +659,7 @@ if (shop = "equipment") { item_cost[i] = 0; forge_cost[i] = 0; i += 1; - item[i] = "Contemptor Dreadnought"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - nobuy[i]=1 - i += 1; - nobuy[i]=1; - item[i] = "Twin-linked Volkite Culverins"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - nobuy[i]=1; - item[i] = "Contemptor CCW"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - forge_cost[i] = 0; - i += 1; - nobuy[i]=1; - + var mc = 0; repeat(i) { mc++; diff --git a/objects/obj_turn_end/Draw_0.gml b/objects/obj_turn_end/Draw_0.gml index 17a7fc0f1d..4163584fe1 100644 --- a/objects/obj_turn_end/Draw_0.gml +++ b/objects/obj_turn_end/Draw_0.gml @@ -15,9 +15,180 @@ if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite if (show>0) and (current_battle<=battles){ - + var xxx,yyy,i; + xxx=__view_get( e__VW.XView, 0 )+535; + yyy=__view_get( e__VW.YView, 0 )+200; + i=current_battle; - + draw_sprite(spr_purge_panel,0,xxx,yyy); + // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); + // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); + if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174); + if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174); + + draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray); + draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles))); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0); + if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0); + + scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); + // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); + + draw_set_font(fnt_40k_14);draw_set_halign(fa_left); + + + + if (battle_world[i]<0){ + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_left); + + draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Fleets:")); + draw_text(xxx+332,yyy+237,string_hash_to_newline("Allied Fleets:")); + + if (string(strin[1])="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleship ("+string(strin[4])+"% HP)")); + if (string(strin[2])="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigate ("+string(strin[5])+"% HP)")); + if (string(strin[3])="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escort ("+string(strin[6])+"% HP)")); + if (string(strin[1])!="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleships ("+string(strin[4])+"% HP)")); + if (string(strin[2])!="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigates ("+string(strin[5])+"% HP)")); + if (string(strin[3])!="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escorts ("+string(strin[6])+"% HP)")); + + + draw_set_halign(fa_center); + + if (enemy_fleet[1]!=0){ + // draw_sprite(spr_force_icon,enemy_fleet[1],xxx+44,yyy+269); + scr_image("ui/force",enemy_fleet[1],xxx+44-32,yyy+269-32,64,64); + var shw;shw=""; + if (ecap[1]=1) then shw+=string(ecap[1])+" Battleship#"; + if (ecap[1]!=1) then shw+=string(ecap[1])+" Battleships#"; + if (efri[1]=1) then shw+=string(efri[1])+" Frigate#"; + if (efri[1]!=1) then shw+=string(efri[1])+" Frigates#"; + if (eesc[1]=1) then shw+=string(eesc[1])+" Escort#"; + if (eesc[1]!=1) then shw+=string(eesc[1])+" Escorts#"; + + draw_text_transformed(xxx+44,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); + draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); + } + if (enemy_fleet[2]!=0){ + // draw_sprite(spr_force_icon,enemy_fleet[2],xxx+154,yyy+269); + scr_image("ui/force",enemy_fleet[2],xxx+154-32,yyy+269-32,64,64); + var shw;shw=""; + if (ecap[2]=1) then shw+=string(ecap[2])+" Battleship#"; + if (ecap[2]!=1) then shw+=string(ecap[2])+" Battleships#"; + if (efri[2]=1) then shw+=string(efri[2])+" Frigate#"; + if (efri[2]!=1) then shw+=string(efri[2])+" Frigates#"; + if (eesc[2]=1) then shw+=string(eesc[2])+" Escort#"; + if (eesc[2]!=1) then shw+=string(eesc[2])+" Escorts#"; + + draw_text_transformed(xxx+154,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); + draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); + } + if (enemy_fleet[3]!=0){ + // draw_sprite(spr_force_icon,enemy_fleet[3],xxx+264,yyy+269); + scr_image("ui/force",enemy_fleet[3],xxx+264-32,yyy+269-32,64,64); + var shw;shw=""; + if (ecap[3]=1) then shw+=string(ecap[3])+" Battleship#"; + if (ecap[3]!=1) then shw+=string(ecap[3])+" Battleships#"; + if (efri[3]=1) then shw+=string(efri[3])+" Frigate#"; + if (efri[3]!=1) then shw+=string(efri[3])+" Frigates#"; + if (eesc[3]=1) then shw+=string(eesc[3])+" Escort#"; + if (eesc[3]!=1) then shw+=string(eesc[3])+" Escorts#"; + + draw_text_transformed(xxx+264,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); + draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); + } + + if (allied_fleet[1]!=0){ + // draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269); + scr_image("ui/force",allied_fleet[1],xxx+374-32,yyy+269-32,64,64); + var shw;shw=""; + if (acap[1]=1) then shw+=string(acap[1])+" Battleship#"; + if (acap[1]!=1) then shw+=string(acap[1])+" Battleships#"; + if (afri[1]=1) then shw+=string(afri[1])+" Frigate#"; + if (afri[1]!=1) then shw+=string(afri[1])+" Frigates#"; + if (aesc[1]=1) then shw+=string(aesc[1])+" Escort#"; + if (aesc[1]!=1) then shw+=string(aesc[1])+" Escorts#"; + + draw_text_transformed(xxx+374,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); + draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); + } + if (allied_fleet[2]!=0){ + // draw_sprite(spr_force_icon,allied_fleet[1],xxx+484,yyy+269); + scr_image("ui/force",allied_fleet[1],xxx+484-32,yyy+269-32,64,64); + var shw;shw=""; + if (acap[2]=1) then shw+=string(acap[2])+" Battleship#"; + if (acap[2]!=1) then shw+=string(acap[2])+" Battleships#"; + if (afri[2]=1) then shw+=string(afri[2])+" Frigate#"; + if (afri[2]!=1) then shw+=string(afri[2])+" Frigates#"; + if (aesc[2]=1) then shw+=string(aesc[2])+" Escort#"; + if (aesc[2]!=1) then shw+=string(aesc[2])+" Escorts#"; + + draw_text_transformed(xxx+484,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); + draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); + } + + + + + + draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); + draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Retreat"),1.1,1.1,0); + if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ + draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); + } + + draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); + draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Fight"),1.1,1.1,0); + if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ + draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); + } + + } + + + if (battle_world[i]>=1){ + if (battle_opponent[i]<=20){ + draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Marines")); + draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Vehicles")); + if (strin[3]!="") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Fortified"));// Not / Barely / Lightly / Moderately / Highly / Maximally + } + + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_left); + + draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Factions:")); + draw_text(xxx+332,yyy+237,string_hash_to_newline("Allies:")); + + + + draw_set_halign(fa_center); + // draw_sprite(spr_force_icon,battle_opponent[i],xxx+44,yyy+289); + scr_image("ui/force",battle_opponent[i],xxx+44-32,yyy+289-32,64,64); + draw_text_transformed(xxx+44,yyy+316,string_hash_to_newline(string(strin[4])),0.75,1,0); + draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); + + + draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); + draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Offensive"),1.1,1.1,0); + if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ + draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); + } + + draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); + draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Defensive"),1.1,1.1,0); + if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ + draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); + } + + + + + + } } diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 2a64a85a03..6748fd8ad7 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -33,43 +33,5 @@ if (alerts>0) and (popups_end=1){ } } -main_slate.inside_method = function(){ - if (show>0 && current_battle<=battles && current_battle>-1){ - var xxx=main_slate.XX; - var yyy=main_slate.YY; - var i=current_battle; - - // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); - // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); - var _img = battle_world[i]==-50; - scr_image("attacked",_img,xxx+12,yyy+54,254,174); - - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,$"{i}/{battles}"); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})",0.7,0.7,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)",0.7,0.7,0); - - scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); - // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); - - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - if (battle_world[current_battle]<0){ - draw_player_fleet_combat_options(); - } else if (battle_world[i]>=1){ - draw_player_ground_combat_options(); - } - } - draw_set_alpha(1); -} - -if (show>0 && current_battle<=battles && current_battle>-1 ){ - main_slate.draw_with_dimensions(535, 200, 530, 400); -} +draw_set_alpha(1); diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 61243fd919..1c108d09fd 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -134,299 +134,269 @@ function ComplexSet(_unit) constructor { right_arm_data = []; - static base_modulars_checks = function(mod_item){ - _are_exceptions = false; - var _mod = mod_item; - exceptions = []; + static assign_modulars = function(modulars = global.modular_drawing_items, position = false) { + var _mod = {}; + var _sub_comps = false - if (array_contains(blocked, _mod.position)) { - return false; - } + try { + for (var i = 0; i < array_length(modulars); i++) { + _are_exceptions = false; + _mod = modulars[i]; + exceptions = []; + _sub_comps = "none"; - if (struct_exists(_mod, "allow_either")) { - _are_exceptions = true; - exceptions = []; - for (var m = 0; m < array_length(_mod.allow_either); m++) { - array_push(exceptions, _mod.allow_either[m]); - } - } - if (struct_exists(_mod, "max_saturation")) { - var _max_sat = _mod.max_saturation; - } - if (struct_exists(_mod, "exp")) { - var _exp_data = _mod.exp; - var _min = 0; - if (struct_exists(_exp_data, "min")) { - _min = _exp_data.min; - if (unit.experience < _exp_data.min) { - if (!check_exception("min_exp")) { - return false; + if (array_contains(blocked, _mod.position)) { + continue; + } + + if (struct_exists(_mod, "allow_either")) { + _are_exceptions = true; + exceptions = []; + for (var m = 0; m < array_length(_mod.allow_either); m++) { + array_push(exceptions, _mod.allow_either[m]); } } - } - if (struct_exists(_exp_data, "scale")) { - var _m_exp = _exp_data.exp_scale_max; - var _increment_count = _mod.max_saturation / 5; - var _increments = (_m_exp - _min) / _increment_count; - var _sat_roof = _mod.max_saturation; - var _mar_exp = unit.experience; - - if (_mar_exp >= _m_exp) { - spawn_chance = _mod.max_saturation; - } else { - var calc_exp = _mar_exp - _min; - var _inc_point = floor(_mar_exp / _increments); - _max_sat = _inc_point * 5; + if (struct_exists(_mod, "max_saturation")) { + var _max_sat = _mod.max_saturation; } - } - } - if (struct_exists(_mod, "max_saturation")) { - if (struct_exists(variation_map, _mod.position)) { - if (variation_map[$ _mod.position] >= _max_sat) { - if (!check_exception("max_saturation")) { - return false; + if (struct_exists(_mod, "exp")) { + var _exp_data = _mod.exp; + var _min = 0; + if (struct_exists(_exp_data, "min")) { + _min = _exp_data.min; + if (unit.experience < _exp_data.min) { + if (!check_exception("min_exp")) { + continue; + } + } + } + if (struct_exists(_exp_data, "scale")) { + var _m_exp = _exp_data.exp_scale_max; + var _increment_count = _mod.max_saturation / 5; + var _increments = (_m_exp - _min) / _increment_count; + var _sat_roof = _mod.max_saturation; + var _mar_exp = unit.experience; + + if (_mar_exp >= _m_exp) { + spawn_chance = _mod.max_saturation; + } else { + var calc_exp = _mar_exp - _min; + var _inc_point = floor(_mar_exp / _increments); + _max_sat = _inc_point * 5; + } } } - } - } - if (!struct_exists(_mod, "body_types")) { - _mod.body_types = [0, 1, 2]; - } - - if (!array_contains(_mod.body_types, armour_type)) { - if (!check_exception("body_types")) { - return false; - } - } - - if (struct_exists(_mod, "role_type")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.role_type); a++) { - var _r_t = _mod.role_type[a]; - _viable = unit.IsSpecialist(_r_t); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - return false; + if (struct_exists(_mod, "max_saturation")) { + if (struct_exists(variation_map, _mod.position)) { + if (variation_map[$ _mod.position] >= _max_sat) { + if (!check_exception("max_saturation")) { + continue; + } + } + } } - if (!check_exception("chapter_disadv")) { - return false; + if (!struct_exists(_mod, "body_types")) { + _mod.body_types = [0, 1, 2]; } - } - } - if (struct_exists(_mod, "roles")) { - if (!array_contains(_mod.roles, unit.role())) { - if (!check_exception("roles")) { - return false; + + if (!array_contains(_mod.body_types, armour_type)) { + if (!check_exception("body_types")) { + continue; + } } - } - } - if (struct_exists(_mod, "cultures")) { - if (!scr_has_style(_mod.cultures)) { - if (!check_exception("cultures")) { - return false; + + if (struct_exists(_mod, "role_type")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.role_type); a++) { + var _r_t = _mod.role_type[a]; + _viable = unit.IsSpecialist(_r_t); + if (_viable) { + break; + } + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + continue; + } + if (!check_exception("chapter_disadv")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "company")) { - if (!array_contains(_mod.company, unit.company)) { - if (!check_exception("company")) { - return false; + if (struct_exists(_mod, "roles")) { + if (!array_contains(_mod.roles, unit.role())) { + if (!check_exception("roles")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "armours")) { - if (!array_contains(_mod.armours, unit_armour)) { - if (!check_exception("armours")) { - return false; + if (struct_exists(_mod, "cultures")) { + if (!scr_has_style(_mod.cultures)) { + if (!check_exception("cultures")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "armours_exclude")) { - if (array_contains(_mod.armours_exclude, unit_armour)) { - if (!check_exception("armours_exclude")) { - return false; + if (struct_exists(_mod, "company")) { + if (!array_contains(_mod.company, unit.company)) { + if (!check_exception("company")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "chapter_adv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_adv); a++) { - var _adv = _mod.chapter_adv[a]; - _viable = scr_has_adv(_adv); - if (_viable) { - break; + if (struct_exists(_mod, "armours")) { + if (!array_contains(_mod.armours, unit_armour)) { + if (!check_exception("armours")) { + continue; + } + } } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - return false; + if (struct_exists(_mod, "armours_exclude")) { + if (array_contains(_mod.armours_exclude, unit_armour)) { + if (!check_exception("armours_exclude")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "chapter_disadv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { - var _disadv = _mod.chapter_disadv[a]; - _viable = scr_has_disadv(_disadv); - if (_viable) { - break; + if (struct_exists(_mod, "chapter_adv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_adv); a++) { + var _adv = _mod.chapter_adv[a]; + _viable = scr_has_adv(_adv); + if (_viable) { + break; + } + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + continue; + } + } } - } - if (!_viable) { - if (!check_exception("chapter_disadv")) { - return false; + if (struct_exists(_mod, "chapter_disadv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { + var _disadv = _mod.chapter_disadv[a]; + _viable = scr_has_disadv(_disadv); + if (_viable) { + break; + } + } + if (!_viable) { + if (!check_exception("chapter_disadv")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "stats")) { - if (!stat_valuator(_mod.stats, unit)) { - if (!check_exception("stats")) { - return false; + if (struct_exists(_mod, "stats")) { + if (!stat_valuator(_mod.stats, unit)) { + if (!check_exception("stats")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "equipped")) { - if (!unit.has_equipped(_mod.equipped)) { - if (!check_exception("equipped")) { - return false; + if (struct_exists(_mod, "equipped")) { + if (!unit.has_equipped(_mod.equipped)) { + if (!check_exception("equipped")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "traits")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.traits); a++) { - var _trait = _mod.traits[a]; - _viable = unit.has_trait(_trait); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("traits")) { - return false; + if (struct_exists(_mod, "traits")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.traits); a++) { + var _trait = _mod.traits[a]; + _viable = unit.has_trait(_trait); + if (_viable) { + break; + } + } + if (!_viable) { + if (!check_exception("traits")) { + continue; + } + } } - } - } - if (struct_exists(_mod, "chapter")) { - var chap_name = instance_exists(obj_creation) ? obj_creation.chapter_name : global.chapter_name; - if (chap_name != _mod.chapter) { - if (!check_exception("chapter")) { - return false; + if (struct_exists(_mod, "chapter")) { + var chap_name = instance_exists(obj_creation) ? obj_creation.chapter_name : global.chapter_name; + if (chap_name != _mod.chapter) { + if (!check_exception("chapter")) { + continue; + } + } } - } - } - _overides = "none"; - if (struct_exists(_mod, "overides")) { - _overides = {overides:_mod.overides}; - } - if (struct_exists(_mod, "offsets")){ - var _x = 0; - var _y = 0; - if (struct_exists(_mod.offsets,unit_armour)){ - var _offset = _mod.offsets[$ unit_armour]; - if (struct_exists(_offset,"x")){ - _x += _offset.x; + var _overides = "none"; + if (struct_exists(_mod, "overides")) { + _overides = _mod.overides; } - if (struct_exists(_offset,"y")){ - _x += _offset.y; - } - } - if (_x != 0 || _y !=0){ - if (_overides == "none"){ - _overides = {offsets:[_x, _y]}; - } else { - _overides.offsets = [_x, _y] - } - } - } - - if (struct_exists(_mod, "subcomponents")){ - _sub_comps = _mod.subcomponents; - } - if (struct_exists(_mod, "body_parts")){ - var _viable = true; - var _body_areas = struct_get_names(_mod.body_parts); - for (var b=0;b= _status_level) { - var variation_tier = (_unit_tier - _status_level) + 1; - if (variation_map[$ _area] % variation_tier != 0) { - return false; - } - } - } - - return true; - } - static assign_modulars = function(modulars = global.modular_drawing_items, position = false) { - var _mod = {}; + if (struct_exists(_mod, "assign_by_rank")) { + var _area = _mod.position; + var _status_level = _mod.assign_by_rank; + var _roles = active_roles(); + var tiers = [ + ["Chapter Master"], + ["Forge Master", "Master of Sanctity", "Master of the Apothecarion", string("Chief {0}", _roles[eROLE.Librarian])], + [_roles[eROLE.Captain], _roles[eROLE.HonourGuard]], + [_roles[eROLE.Champion]], + [_roles[eROLE.Ancient], _roles[eROLE.VeteranSergeant]], + [_roles[eROLE.Terminator]], + [_roles[eROLE.Veteran], _roles[eROLE.Sergeant], _roles[eROLE.Chaplain], _roles[eROLE.Apothecary], _roles[eROLE.Techmarine], _roles[eROLE.Librarian]], + ["Codiciery", "Lexicanum", _roles[eROLE.Tactical], _roles[eROLE.Assault], _roles[eROLE.Devastator]], + [_roles[eROLE.Scout]] + ]; - try { - for (var i = 0; i < array_length(modulars); i++) { - _sub_comps = "none"; - _mod = modulars[i]; - var _allowed = base_modulars_checks(_mod); + var _unit_tier = 8; + if (_unit_tier == 8) { + for (var t = 0; t < array_length(tiers); t++) { + var tier = tiers[t]; + if (array_contains(tier, unit.role())) { + _unit_tier = t; + } + } + } + if (_unit_tier >= _status_level) { + var variation_tier = (_unit_tier - _status_level) + 1; + if (variation_map[$ _area] % variation_tier != 0) { + continue; + } + } + } - if (!_allowed){ - continue; - } if (position != false) { if (position == "weapon") { var _weapon_map = _mod.weapon_map; @@ -438,10 +408,10 @@ function ComplexSet(_unit) constructor { } } } else { - add_to_area(_mod.position, _mod.sprite, _overides, _sub_comps); + add_to_area(_mod.position, _mod.sprite, _overides,_sub_comps); } if (struct_exists(_mod, "prevent_others")) { - replace_area(_mod.position, _mod.sprite, _overides, _sub_comps); + replace_area(_mod.position, _mod.sprite, _overides,_sub_comps); array_push(blocked, _mod.position); if (struct_exists(_mod, "ban")) { for (var b = 0; b < array_length(_mod.ban); b++) { @@ -506,7 +476,6 @@ function ComplexSet(_unit) constructor { left_weapon: unit.get_body_data("weapon_variation", "left_arm"), right_weapon: unit.get_body_data("weapon_variation", "right_arm"), necklace : unit.get_body_data("hanging_variant", "throat"), - foreground_item : unit.get_body_data("variant", "throat"), }; static draw_component = function(component_name, texture_draws = {}) { @@ -516,10 +485,6 @@ function ComplexSet(_unit) constructor { if (struct_exists(self, component_name)) { var _sprite = self[$ component_name]; if (sprite_exists(_sprite)) { - - var _draw_x = x_surface_offset; - var _draw_y = y_surface_offset; - var choice = 0; var _map_choice = 3; if (struct_exists(variation_map, component_name)) { @@ -531,18 +496,9 @@ function ComplexSet(_unit) constructor { for (var i = 0; i < array_length(_overide_set); i++) { var _spec_over = _overide_set[i]; if (_spec_over[0] <= choice && _spec_over[1] > choice) { - var _override_data = _spec_over[2]; - if (struct_exists(_override_data, "overides")){ - _override_areas = struct_get_names(_override_data.overides); - var _overs = _override_data.overides; - for (var j = 0; j < array_length(_override_areas); j++) { - replace_area(_override_areas[j], _overs[$ _override_areas[j]]); - } - } - if (struct_exists(_override_data, "offsets")){ - var _offsets = _override_data.offsets; - _draw_x += _offsets[0]; - _draw_y += _offsets[1]; + var _override_areas = struct_get_names(_spec_over[2]); + for (var j = 0; j < array_length(_override_areas); j++) { + replace_area(_override_areas[j], _spec_over[2][$ _override_areas[j]]); } } } @@ -586,20 +542,20 @@ function ComplexSet(_unit) constructor { // show_debug_message($"{_tex_data.areas[t]}"); var _replace_col = shader_get_uniform(armour_texture, "replace_colour"); shader_set_uniform_f_array(_replace_col, _tex_data.areas[t]); - draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); + draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); } } surface_reset_target(); surface_set_target(_return_surface); shader_set(full_livery_shader); - draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); + draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); draw_surface(base_component_surface, 0, 0); surface_reset_target(); surface_clear_and_free(base_component_surface); surface_set_target(_return_surface); } else { - draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); + draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); } if (struct_exists(subcomponents, component_name)) { var _subcomponents_found = false; @@ -619,13 +575,13 @@ function ComplexSet(_unit) constructor { //show_debug_message($"subcomponents 2: {_subcomponents}"); var _sub_choice = 0; if (_map_choice != 0){ - _sub_choice = floor(sin(_map_choice) * 100); + _sub_choice = sqr(_map_choice + 1) - i; } var _total_options = -1; for (var s=0;s -1){ if (_total_options == 0){ @@ -640,8 +596,7 @@ function ComplexSet(_unit) constructor { _choice_count = 0; for (var s=0;s= _choice_count && _sub_choice_final < _choice_count+sprite_get_number(_subcomponents[s])){ - //show_debug_message($"{_sub_choice_final}, {_choice_count}"); - draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, _draw_x, _draw_y); + draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, x_surface_offset, y_surface_offset); break; } else { _choice_count += sprite_get_number(_subcomponents[s]); @@ -743,18 +698,6 @@ function ComplexSet(_unit) constructor { }; static draw_weapon_and_hands = function() { - if (armour_type == ArmourType.Dreadnought){ - show_debug_message("dread weapons"); - if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { - draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); - show_debug_message("dread right"); - } - if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite)) { - draw_sprite(weapon_left.sprite, 0, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); - show_debug_message("dread left"); - } - exit; - } // Draw hands bellow the weapon sprite; if (!weapon_right.ui_twoh && !weapon_left.ui_twoh) { for (var i = 0; i <= 1; i++) { @@ -986,8 +929,7 @@ function ComplexSet(_unit) constructor { "left_pauldron_embeleshments", "right_pauldron_hangings", "left_pauldron_hangings", - "left_personal_livery", - "foreground_item", + "left_personal_livery" ]; } else { _draw_order = [ @@ -1022,8 +964,7 @@ function ComplexSet(_unit) constructor { "tabbard", "robe", "belt", - "left_personal_livery", - "foreground_item", + "left_personal_livery" ]; } for (var i = 0; i < array_length(_draw_order); i++) { @@ -1253,13 +1194,6 @@ function ComplexSet(_unit) constructor { }); armour_type = ArmourType.Dreadnought; break; - case "Contemptor Dreadnought": - add_group({ - armour: spr_contemptor_chasis_colors, - head: spr_contemptor_head_colors, - }); - armour_type = ArmourType.Dreadnought; - break; case "Scout Armour": add_group({ armour: spr_scout_complex, @@ -1350,11 +1284,6 @@ function ComplexSet(_unit) constructor { } }; - offsets=[]; - static add_offsets = function(area, _offset_start, sprite_length, overide_data){ - - } - static add_overide = function(area, _overide_start, sprite_length, overide_data) { if (!struct_exists(overides, area)) { overides[$ area] = []; @@ -1366,26 +1295,7 @@ function ComplexSet(_unit) constructor { if (!struct_exists(subcomponents, area)) { subcomponents[$ area] = []; } - var _accepted_subs = []; - for (var i=0;i0){ if (_loc_heal_points >0){ if (turn_end){ diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 0656451694..4df8b32416 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -323,12 +323,14 @@ global.modular_drawing_items = [ } }, { + cultures : ["Cthonian", "Gothic"], sprite : spr_chap_trim_left, body_types :[0], position : "left_trim", role_type : [SPECIALISTS_CHAPLAINS], }, { + cultures : ["Cthonian", "Gothic"], sprite : spr_chap_trim_right, body_types :[0], position : "right_trim", @@ -573,10 +575,7 @@ global.modular_drawing_items = [ body_types :[0], position : "belt", role_type : [SPECIALISTS_CHAPLAINS], - cultures : ["Gothic"], - armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], - allow_either : ["cultures", "role_type"], - + armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], }, { sprite : spr_tech_belt, @@ -1250,55 +1249,7 @@ global.modular_drawing_items = [ [spr_blank, spr_cata_right_trim_2], [spr_blank, spr_cata_right_trim_1], ], - }, - { - position : "foreground_item", - sprite: spr_gear_combat_shield, - body_types: [0,1, 2], - offsets : { - "Terminator Armour" : { - y : -10, - x : -15, - }, - "Tartaros" : { - x : -8, - } - }, - subcomponents :[ - [spr_blank, spr_combat_shield_bottom_part], - ], - equipped : { - "gear" : "Combat Shield", - }, - }, - { - position : "right_eye", - sprite : spr_gear_apoth_eye, - role_type : [SPECIALISTS_APOTHECARIES], - offsets : { - "Terminator Armour":{ - y :-6, - }, - "Tartaros":{ - y :-6, - } - } - - }, - { - position : "backpack_decoration", - sprite : spr_gear_apoth, - role_type : [SPECIALISTS_APOTHECARIES], - offsets : { - "Terminator Armour":{ - y :- 22, - }, - "Tartaros":{ - y :- 30, - } - } - - } + }, ]; @@ -1792,11 +1743,6 @@ base: { }, variants : [{ sprite: spr_weapon_assca, - }, - { - sprite: spr_weapon_assca, - body_types: [3], - armours : ["Dreadnought"], }], }, "Heavy Flamer": { @@ -1827,97 +1773,9 @@ base: { variants: [ { sprite: spr_weapon_lasca, - }, - { - sprite: spr_dread_plasma_cannon, - body_types: [3], - armours : ["Dreadnought"], } ], }, -"Close Combat Weapon" : { - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - armours : ["Dreadnought"], - }, - variants: [ - { - sprite: spr_dread_claw, - }, - { - sprite: spr_contemptor_CCW, - armours : ["Contemptor Dreadnought"], - } - ] -}, -"Twin Linked Heavy Bolter" : { - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_dread_heavy_bolter, - } - ] -}, -"Dreadnought Lightning Claw": { - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_dread_claw, - } - ] -}, -"CCW Heavy Flamer": { - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_dread_claw, - } - ] -}, -"Dreadnought Power Claw": { - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_dread_claw, - } - ] -}, -"Inferno Cannon": { - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_dread_plasma_cannon, - } - ] -}, "Multi-Melta" : { base: { body_types: [0, 1], @@ -1928,52 +1786,8 @@ base: { variants: [ { sprite: spr_weapon_mmelta, - }, - { - sprite: spr_dread_plasma_cannon, - body_types: [3], - armours : ["Dreadnought"], - } - ], -}, -"Twin Linked Lascannon": { - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_dread_lascannon, - } - ] -}, -"Heavy Conversion Beam Projector":{ - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_dread_plasma_cannon, } - ] -}, -"Twin-linked Volkite Culverins":{ - base: { - body_types: [3], - weapon_data: { - display_type: "dreadnought", - }, - }, - variants: [ - { - sprite: spr_twl_Volkite_Culverins, - } - ] + ], }, "Bolt Pistol": { base: { @@ -1984,7 +1798,7 @@ base: { }, variants: [{ sprite: spr_weapon_boltpis, - }], + }] }, "Infernus Pistol": { @@ -2174,16 +1988,9 @@ base: { new_weapon_draw: true }, }, - variants: [ - { - sprite: spr_weapon_missile, - }, - { - sprite: spr_dread_missile, - body_types: [3], - armours : ["Dreadnought"], - } - ] + variants: [{ + sprite: spr_weapon_missile, + }] }, "Plasma Cannon": { base: { @@ -2202,11 +2009,6 @@ base: { }, sprite: spr_weapon_plasc, body_types: [0, 1] - }, - { - sprite: spr_dread_plasma_cannon, - body_types: [3], - armours : ["Dreadnought"], } ] }, @@ -2386,11 +2188,6 @@ base: { variants: [ { sprite: spr_weapon_autocannon2 - }, - { - sprite: spr_dread_autocannon, - body_types: [3], - armours : ["Dreadnought"], } ] }, diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index 058dbf4a31..7134b2d637 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -262,7 +262,9 @@ function scr_draw_unit_image(_background = false) { var servo_harness = 0; var halo = 0; var reverent_guardians = false; + var tech_brothers_trait = -5; var body_part; + var dev_trait = 0; static _body_parts = ARR_body_parts; // Chaplain @@ -327,24 +329,24 @@ function scr_draw_unit_image(_background = false) { halo = 1; } - if (is_dreadnought()){ - armour_type = ArmourType.Dreadnought; - } else { - switch (unit_armour) { - case "Scout Armour": - armour_type = ArmourType.Scout; - break; - case "Terminator Armour": - case "Tartaros": - case "Cataphractii": - armour_type = ArmourType.Terminator; - break; - case ITEM_NAME_NONE: - case "": - case "None": - armour_type = ArmourType.None; - break; - } + switch (unit_armour) { + case "Scout Armour": + armour_type = ArmourType.Scout; + break; + case "Terminator Armour": + case "Tartaros": + case "Cataphractii": + armour_type = ArmourType.Terminator; + break; + case "Dreadnought": + case "Contemptor Dreadnought": + armour_type = ArmourType.Dreadnought; + break; + case ITEM_NAME_NONE: + case "": + case "None": + armour_type = ArmourType.None; + break; } draw_backpack = armour_type == ArmourType.Normal; @@ -361,6 +363,55 @@ function scr_draw_unit_image(_background = false) { pauldron_trim = _controller ? obj_controller.trim : obj_creation.trim; //TODO complex shader means no need for all this edge case stuff + + // Dark Angels Deathwing + if (unit_special_colours == UnitSpecialColours.Deathwing) { + if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Librarian], _role[eROLE.Techmarine]], unit_role)) { + shader_array_set[ShaderType.Body] = Colors.Deathwing; + shader_array_set[ShaderType.Trim] = Colors.Light_Caliban_Green; + if (unit_role != _role[eROLE.Apothecary]) { + shader_array_set[ShaderType.Helmet] = Colors.Deathwing; + } + } + if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Techmarine]], unit_role)) { + shader_array_set[ShaderType.RightPauldron] = Colors.Deathwing; + } + shader_array_set[ShaderType.LeftPauldron] = Colors.Deathwing; + pauldron_trim = 0; + specialist_colours = 0; + } + + // Dark Angels Ravenwing + if (unit_special_colours == UnitSpecialColours.Ravenwing) { + if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Librarian], _role[eROLE.Techmarine], _role[eROLE.Apothecary]], unit_role)) { + shader_array_set[ShaderType.Body] = Colors.Black; + shader_array_set[ShaderType.Helmet] = Colors.Black; + } + if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Techmarine]], unit_role)) { + shader_array_set[ShaderType.RightPauldron] = Colors.Black; + } + shader_array_set[ShaderType.LeftPauldron] = Colors.Black; + pauldron_trim = 0; + specialist_colours = 0; + } + + // Dark Angels Captains + if (unit_chapter == "Dark Angels" && unit_role == _role[eROLE.Captain] && company != 1) { + shader_array_set[ShaderType.RightPauldron] = Colors.Dark_Red; + shader_array_set[ShaderType.Helmet] = Colors.Deathwing; + pauldron_trim = 0; + specialist_colours = 0; + } + + // Dark Angels Honour Guard + if (unit_chapter == "Dark Angels" && unit_role == _role[eROLE.HonourGuard]) { + shader_array_set[ShaderType.Body] = Colors.Deathwing; + shader_array_set[ShaderType.RightPauldron] = Colors.Deathwing; + shader_array_set[ShaderType.LeftPauldron] = Colors.Deathwing; + shader_array_set[ShaderType.Trim] = Colors.Copper; + pauldron_trim = 0; + specialist_colours = 0; + } //We can return to the custom shader values at any time during draw doing this set_shader_array(shader_array_set); // Marine draw sequence @@ -377,8 +428,28 @@ function scr_draw_unit_image(_background = false) { //Rejoice! // draw_sprite(spr_marine_base,img,x_surface_offset,y_surface_offset); + if (unit_armour != "") { + var yep = 0; + if (scr_has_adv("Devastator Doctrine")) { + dev_trait = 1; + } + if (unit_specialization == UnitSpecialization.Techmarine) { + if (scr_has_adv("Tech-Brothers")) { + tech_brothers_trait = 0; + } + } + } else { + armour_sprite = spr_weapon_blank; + } // Define armour - armour_sprite = spr_weapon_blank; + // Draw the lights + if ((unit_specialization == UnitSpecialization.Apothecary) && (unit_armour != "") && (back_equipment == BackType.None)) { + if (unit_armour == "Terminator Armour") { + draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 22); // for terminators + } else { + draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 6); + } // for normal power armour + } // Draw Techmarine gear if ((servo_arm > 0 || servo_harness > 0) && (!arm_bypass)) { @@ -450,10 +521,11 @@ function scr_draw_unit_image(_background = false) { if (body.torso.robes == 0) { complex_set.add_to_area("robe", spr_marine_robes); } else if (body.torso.robes == 1) { - if (scr_has_disadv("Warp Tainted")) { + if (scr_has_disadv("Warp Tainted") && !modest_livery) { complex_set.add_to_area("robes", spr_binders_robes); + } else { + complex_set.add_to_area("robes", spr_marine_robes); } - complex_set.add_to_area("robes", spr_marine_robes); } else { complex_set.add_to_area("tabbard", spr_cloth_tabbard); } @@ -478,8 +550,22 @@ function scr_draw_unit_image(_background = false) { draw_sprite(armour_draw[0], armour_draw[1], x_surface_offset, y_surface_offset); } + // Draw decals, features and other stuff + if ((dev_trait >= 10) && (!modest_livery)) { + draw_sprite(armour_sprite, dev_trait, x_surface_offset, y_surface_offset); + } // Devastator Doctrine battle damage + // if (tech_brothers_trait>=0) and (modest_livery=0) then draw_sprite(spr_gear_techb,tech_brothers_trait,x_surface_offset,y_surface_offset);// Tech-Brothers bling + //sgt helms + // Apothecary Details if (unit_specialization == UnitSpecialization.Apothecary) { + if (unit_armour == "Tartaros") { + draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); // was y_draw-4 with old tartar + } else if (unit_armour == "Terminator Armour") { + draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); + } else { + draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset); + } if (gear() == "Narthecium") { if (armour_type == ArmourType.Normal) { draw_sprite(spr_narthecium_2, 0, x_surface_offset + 66, y_surface_offset + 5); @@ -489,15 +575,49 @@ function scr_draw_unit_image(_background = false) { } } } + + // Draw Custom Helmets + if (armour_type == ArmourType.Normal && !armour_bypass) { + if (unit_role == _role[eROLE.Champion]) { + draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); + } + if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { + draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); + } + } else if (unit_armour == "Terminator Armour" && !armour_bypass) { + if (unit_role == _role[eROLE.Champion]) { + draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); + } + if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { + draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); + } + } + + var shield_offset_x = 0; + var shield_offset_y = 0; + if (unit_armour == "Terminator Armour") { + shield_offset_x = -15; + shield_offset_y = -10; + } else if (unit_armour == "Tartaros") { + shield_offset_x = -8; + } + if (gear() == "Combat Shield") { + if (unit_role == _role[eROLE.Champion]) { + draw_sprite(spr_gear_combat_shield, 1, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); + } else { + draw_sprite(spr_gear_combat_shield, 0, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); + } + } + // if (reverent_guardians=1) then draw_sprite(spr_pack_brazier,1,x_surface_offset,y_surface_offset); - /*if (armour_type == ArmourType.Dreadnought) { + if (armour_type == ArmourType.Dreadnought) { var left_arm = dreadnought_sprite_components(weapon_two()); var colour_scheme = specialist_colours <= 1 ? 0 : 1; draw_sprite(left_arm, colour_scheme, x_surface_offset, y_surface_offset); colour_scheme += 2; var right_arm = dreadnought_sprite_components(weapon_one()); draw_sprite(right_arm, colour_scheme, x_surface_offset, y_surface_offset); - }* + } /*}else{ draw_set_color(c_gray); draw_text(0,0,string_hash_to_newline("Color swap shader#did not compile")); diff --git a/scripts/scr_get_item_names/scr_get_item_names.gml b/scripts/scr_get_item_names/scr_get_item_names.gml index b321731631..da0793e12f 100644 --- a/scripts/scr_get_item_names/scr_get_item_names.gml +++ b/scripts/scr_get_item_names/scr_get_item_names.gml @@ -150,7 +150,7 @@ function push_marine_mobility_item_names(_item_names) { /// @param {array} _item_names - The list to append to. /// @returns {void} function push_dreadnought_ranged_weapons_item_names(_item_names) { - var item_count = 11; + var item_count = 10; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -164,8 +164,7 @@ function push_dreadnought_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Twin Linked Lascannon"; _item_names[@ index++] = "Twin Linked Assault Cannon Mount"; _item_names[@ index++] = "Twin Linked Heavy Bolter"; - _item_names[@ index++] = "Heavy Conversion Beam Projector"; - _item_names[@ index++] = "Twin-linked Volkite Culverins";// 10 + _item_names[@ index++] = "Heavy Conversion Beam Projector"; // 10 } /// @description This function appends the list of dreadnought melee weapons to the given list. diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index e38b38a20e..624301a718 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1245,7 +1245,6 @@ function scr_initialize_custom() { devastator = devastator + real(s_val); break; case "dreadnought": - case "Contemptor Dreadnought": dreadnought = dreadnought + real(s_val); break; } diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index cc5dece659..5d81409d9b 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -2341,18 +2341,8 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } }; - static is_dreadnought = function(){ - _arm_data = get_armour_data(); - if (is_struct(_arm_data)){ - if (_arm_data.has_tag("dreadnought")){ - return true - } - } - return false; - } - /// @param {Enum.EquipmentSlot} _slot - static add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { + add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { var _slots = array_create(0); switch (_slot) { diff --git a/scripts/scr_reequip_units/scr_reequip_units.gml b/scripts/scr_reequip_units/scr_reequip_units.gml index 04ac7e9e15..148891e25c 100644 --- a/scripts/scr_reequip_units/scr_reequip_units.gml +++ b/scripts/scr_reequip_units/scr_reequip_units.gml @@ -17,9 +17,13 @@ function set_up_equip_popup(){ if (vih==0){ if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - vih = _unit.is_dreadnought() ? 6 : 1; - if (vih == 6){ - _unchangeable_armour = true; + var _arm_data = _unit.get_armour_data(); + vih=1; + if (is_struct(_arm_data)){ + if (_arm_data.has_tag("dreadnought")){ + vih=6; + _unchangeable_armour = true; + } } } else if (man[f]=="vehicle"){ if (ma_role[f]=="Land Raider") { vih=50;} @@ -36,13 +40,12 @@ function set_up_equip_popup(){ break; } else if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - var _is_dread = _unit.is_dreadnought(); - if (_is_dread && vih==1){ - allow=false; - break; - } else if (!_is_dread && vih == 6){ + if (_unit.armour()=="Dreadnought" && vih==1){ + allow=false; + break; + } else if (_unit.armour()!="Dreadnought" && vih==6){ allow=false; - break; + break; } } } else if (vih>=50){ @@ -633,7 +636,7 @@ function draw_popup_equip(){ warning = "Not enough " + string(n_gear) + "; " + string(units - req_gear_num) + " more are required."; } - if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0) && (string_count("Contemptor Dreadnought", n_armour) > 0)) { + if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0)) { n_good4 = 0; warning = "Dreadnoughts may not use infantry equipment."; } @@ -666,7 +669,7 @@ function draw_popup_equip(){ warning = "Cannot use this gear with Terminator Armour."; } - if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought") && (n_armour == "Contemptor Dreadnought")) { + if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought")) { n_good5 = 0; warning = string(obj_ini.role[100][6]) + "s may not use mobility gear."; } diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index 84c57c64eb..68be5a41cf 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -278,9 +278,12 @@ function Roster() constructor{ } } else { if (!array_contains(_squads, "dreadnought")){ - if (_unit.is_dreadnought()){ - array_push(_squads, "dreadnought"); - new_squad_button("Dreadnought", "dreadnought"); + var _armour_data = _unit.get_armour_data(); + if (is_struct(_armour_data)){ + if (_armour_data.has_tag("dreadnought")){ + array_push(_squads, "dreadnought"); + new_squad_button("Dreadnought", "dreadnought"); + } } } } diff --git a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml index 6e55042f90..250a1b7736 100644 --- a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml +++ b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml @@ -189,9 +189,6 @@ function dreadnought_sprite_components(component){ "Multi-Melta": spr_dread_plasma_cannon, "Twin Linked Lascannon": spr_dread_lascannon, "Heavy Conversion Beam Projector": spr_dread_plasma_cannon, - "Twin-linked Volkite Culverins":spr_twl_Volkite_Culverins, - "Contemptor CCW":spr_contemptor_CCW, - }; if (struct_exists(components, component)){ return components[$ component] diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index e86c4e1648..75d466af9a 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -380,7 +380,7 @@ function scr_ui_settings() { draw_rectangle(x5, y5, x5 - string_width(title), y5 + string_height(title) - 2, 0); var nep = false; - + if (((obj_ini.armour[co, ide] == "Terminator Armour") || (obj_ini.armour[co, ide] == "Dreadnought")) && (gg == 4)) { nep = true; } diff --git a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml index a49a67206a..23386f8a3d 100644 --- a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml +++ b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml @@ -110,7 +110,7 @@ function scr_update_unit_armour(new_armour, from_armoury = true, to_armoury = tr } } - if (new_arm_data.has_tag("dreadnought")) { + if (armour() == "Dreadnought") { is_boarder = false; update_gear(""); update_mobility_item(""); diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 33479c14af..2c7e1ebaf7 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -65,22 +65,6 @@ global.weapons = { "arp": 0, "tags": ["Volkite", "energy", "pistol"] }, - "Twin-linked Volkite Culverins":{ - "abbreviation": "T-LVolkCulv", - "attack": { - "standard": 250, - "master_crafted": 270, - "artifact": 290 - }, - "description": "The pistol variant of the long-lost Volkite weapon type, the Serpenta was a mainstay of Moritats and often wielded by Centurions of the Legiones Astartes. Now a symbol of status to match its fearsome potency, a sighting of this ancient weapon would send many foes running.", - "melee_hands": 0, - "ranged_hands": 1, - "ammo": 10, - "range": 3, - "spli": 4, - "arp": 0, - "tags": ["Volkite", "energy", "dreadnought"] - }, //Bolt Pack "Phobos Bolt Pistol": { "abbreviation": "PhBltPis", @@ -731,28 +715,6 @@ global.weapons = { "maintenance" : 0.1, "tags": ["power", "vehicle", "dual", "dreadnought", "fist"], }, - "Contemptor CCW": { - "abbreviation": "ConCCW", - "attack": { - "standard": 300, - "master_crafted": 400, - "artifact": 600 - }, - "melee_mod": { - "standard": 1.2, - "master_crafted": 1.2, - "artifact": 1.2 - }, - "description": "A specialized Lightning Claw variant designed for Dreadnoughts, these claws are capable of ripping through enemy vehicles and infantry with ease.", - "melee_hands": 5, - "ranged_hands": 0, - "ammo": 0, - "range": 1, - "spli": 15, - "arp": 1, - "maintenance" : 0.1, - "tags": ["power", "dual", "dreadnought", "fist"], - }, "Thunder Hammer": { "abbreviation": "ThndHmr", "attack": { @@ -2314,29 +2276,6 @@ global.gear = { "tags": ["dreadnought"], "maintenance" : 1, }, - "Contemptor Dreadnought": { - "abbreviation": "Drdnght", - "armour_value": { - "standard": 50, - "master_crafted": 55, - "artifact": 60 - }, - "ranged_mod": { - "standard": 0, - "master_crafted": 5, // Augmented - "artifact": 10 // Augmented - }, - "melee_mod": { - "standard": 0, - "master_crafted": 5, // Augmented - "artifact": 10 // Augmented - }, - "melee_hands": 8, - "ranged_hands": 8, - "description": "PLACEHOLDER", - "tags": ["dreadnought"], - "maintenance" : 1, - }, "Tartaros": { "abbreviation": "Tartrs", "armour_value": { diff --git a/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png b/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png deleted file mode 100644 index 8d5f84a1a4e0290ded996aeac308be4496fc8005..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrsxTlL_NX4zUw;YQW z8wfBsRBHR5US4!EQUB+af4zGhyv}%?deGwPw`+BbsKKF0=@OiCK#mw_kdSryS5?aW zM4tQC);}rqu9zC+Rr&kx@+rr8-);I|=(v84((Chan>cs$6+e6RKUs$N zkbUPi*1u1`TKfIn{r%c`tL$I>&tv(%yxx4DQ{8jD<>Jz{Go$9`zP@yC*Vaj%J?~gI z&HcVuEAo4#H2Y`EAk|rp_nCIHT81sX_ifwyLgh_gSB9oecln(t|0+eM$NlS^0~1eG zN{24heXv(+%F2MRbL&^1O1sv(m^p$#?m4muD5fx0re0KUY*uft}ZZu-SM2#XX8MG4m@b zWqAMB@^j!nZcs7>fd?k_j2%IqlAHM4-GE%x64!{5l*E!$tK_0oAjM#0U}UOmV4-VZ z5@Kj#Wnyk+VxetdU}a#SG&y-2iiX_$l+3hB+!}(<-3D2z0k@$fGdH!kBr&%Dw;q<; SzpeuHFnGH9xvX2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%o2QFoNX4zUckJ^X zTZphfFz>c?ZD2VO_>4z$*=?&>J%J?#HH{_fmd`$vK4US<38re^T;VEHshf(ahD$cz zXP4-EXus$~UEPutMM0qX0|E~8%zm4DCnrDszuf&|%YPZR4W>ZeeJ`nlYZ_> z+<)7}<;dN?!6$!r#pJGkJpcH9{_n?^n5OtGkJ)fdrk-*28}-UA{*HT2QMFzDKk{eI zzvq6&|Ka+6{r2dpn2a0m%`)XP-<&^ly>{pBdaIK2A{V4$zwBK%v!{7FlhwOHMirLjsmxuHbqhwQ$YO625|3bKA>3tlR>dY1qCanDEYH1;t5^h=v2PwOi+N;~+*#ZR%z>U_xICjQ@d)BdPh z?&NQ}IsbcC;FZe0Ovww&+xMrhrwT;F6GND3g?~DB-pI!^s;ho0Xr7 zBwwu3Tjb>--k)lu_VA6zJI0G^mL__<|NZOj!#Uj5?Ju8y+&Sl}<#nE;DY;cSIiXA| zv%jsJUEp`NWvf@a$eB9R$l`BK2EVttC9W#F5XG{&{;rH}y~uMD{o}V-Us)~L^)z*5 znUT$+^%J?)FK#IZ0z{phBz(Uu+ zB*f6f%EZFT*i_rVz{NoH S4xMZSxzp3t&t;ucLK6UczP)__ diff --git a/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png deleted file mode 100644 index 8d5f84a1a4e0290ded996aeac308be4496fc8005..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrsxTlL_NX4zUw;YQW z8wfBsRBHR5US4!EQUB+af4zGhyv}%?deGwPw`+BbsKKF0=@OiCK#mw_kdSryS5?aW zM4tQC);}rqu9zC+Rr&kx@+rr8-);I|=(v84((Chan>cs$6+e6RKUs$N zkbUPi*1u1`TKfIn{r%c`tL$I>&tv(%yxx4DQ{8jD<>Jz{Go$9`zP@yC*Vaj%J?~gI z&HcVuEAo4#H2Y`EAk|rp_nCIHT81sX_ifwyLgh_gSB9oecln(t|0+eM$NlS^0~1eG zN{24heXv(+%F2MRbL&^1O1sv(m^p$#?m4muD5fx0re0KUY*uft}ZZu-SM2#XX8MG4m@b zWqAMB@^j!nZcs7>fd?k_j2%IqlAHM4-GE%x64!{5l*E!$tK_0oAjM#0U}UOmV4-VZ z5@Kj#Wnyk+VxetdU}a#SG&y-2iiX_$l+3hB+!}(<-3D2z0k@$fGdH!kBr&%Dw;q<; SzpeuHFnGH9xvX2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%o2QFoNX4zUckJ^X zTZphfFz>c?ZD2VO_>4z$*=?&>J%J?#HH{_fmd`$vK4US<38re^T;VEHshf(ahD$cz zXP4-EXus$~UEPutMM0qX0|E~8%zm4DCnrDszuf&|%YPZR4W>ZeeJ`nlYZ_> z+<)7}<;dN?!6$!r#pJGkJpcH9{_n?^n5OtGkJ)fdrk-*28}-UA{*HT2QMFzDKk{eI zzvq6&|Ka+6{r2dpn2a0m%`)XP-<&^ly>{pBdaIK2A{V4$zwBK%v!{7FlhwOHMirLjsmxuHbqhwQ$YO625|3bKA>3tlR>dY1qCanDEYH1;t5^h=v2PwOi+N;~+*#ZR%z>U_xICjQ@d)BdPh z?&NQ}IsbcC;FZe0Ovww&+xMrhrwT;F6GND3g?~DB-pI!^s;ho0Xr7 zBwwu3Tjb>--k)lu_VA6zJI0G^mL__<|NZOj!#Uj5?Ju8y+&Sl}<#nE;DY;cSIiXA| zv%jsJUEp`NWvf@a$eB9R$l`BK2EVttC9W#F5XG{&{;rH}y~uMD{o}V-Us)~L^)z*5 znUT$+^%J?)FK#IZ0z{phBz(Uu+ zB*f6f%EZFT*i_rVz{NoH S4xMZSxzp3t&t;ucLK6UczP)__ diff --git a/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy b/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy deleted file mode 100644 index 06b31e8c60..0000000000 --- a/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy +++ /dev/null @@ -1,96 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_combat_shield_bottom_part", - "bboxMode":0, - "bbox_bottom":220, - "bbox_left":7, - "bbox_right":72, - "bbox_top":189, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"v1","%Name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":232, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","blendMode":0,"displayName":"default","isLocked":false,"name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"spr_combat_shield_bottom_part", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"gear", - "path":"folders/Sprites/Marine Viewer/gear.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_combat_shield_bottom_part", - "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":2.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"spr_combat_shield_bottom_part", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":167.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":"0ca30034-8ae6-44ea-ab2a-6277d1920908","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a05f034-da34-4cbc-9334-b13b05307598","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.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":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":167, -} \ No newline at end of file diff --git a/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png b/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png deleted file mode 100644 index d0f4a7d1051064ae533a15fc4d3246f712efee5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3246 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":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"spr_contemptor_CCW", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "seqHeight":250.0, - "seqWidth":306.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":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e2b8255-80d9-44fb-90a8-fd804243ca38","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, - "volume":1.0, - "xorigin":61, - "yorigin":18, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":306, -} \ No newline at end of file diff --git a/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png b/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png deleted file mode 100644 index 0dbe722fa36abc24af4620e2082e9d4bc3748abe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10643 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 A-2eap diff --git a/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png b/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png deleted file mode 100644 index 0dbe722fa36abc24af4620e2082e9d4bc3748abe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10643 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 A-2eap diff --git a/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy b/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy deleted file mode 100644 index 77b1b3efe9..0000000000 --- a/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy +++ /dev/null @@ -1,92 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_contemptor_chasis_colors", - "bboxMode":0, - "bbox_bottom":249, - "bbox_left":72, - "bbox_right":243, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"v1","%Name":"d55f9e41-41e0-43bd-b40c-86d963212769","name":"d55f9e41-41e0-43bd-b40c-86d963212769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":250, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"c511d01c-c558-46fa-b06f-82950d47dfc4","blendMode":0,"displayName":"default","isLocked":false,"name":"c511d01c-c558-46fa-b06f-82950d47dfc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"spr_contemptor_chasis_colors", - "nineSlice":null, - "origin":9, - "parent":{ - "name":"dreadnought", - "path":"folders/Sprites/Marine Viewer/dreadnought.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_contemptor_chasis_colors", - "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":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"spr_contemptor_chasis_colors", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "seqHeight":250.0, - "seqWidth":306.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":"d55f9e41-41e0-43bd-b40c-86d963212769","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84faeb3a-e305-44d2-80c7-0e9bacc81e82","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, - "volume":1.0, - "xorigin":61, - "yorigin":18, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":306, -} \ No newline at end of file diff --git a/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png b/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png deleted file mode 100644 index 1adb1412918757424e86830a0c8f0f051a9f0852..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1083 zcmeAS@N?(olHy`uVBq!ia0y~yU^D`14Ba#P!1^6 z@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2Y)RhkE)4%caKYZ?lNlJ8^*mi1Ln>~)z2lpA zIY5H-!s{(s1`V3RGtwn*dR}`VdL`1U{mr7?3eGIb%M2V84)Dk<_xl`t*`g?Fu5e`8 zlkYd{CYApF^h$*hXgGfG;H2iUeGK#VDxJJPFIV03)kggp%byp$;eK#)m&d2wH`nBE zE7vcZ5|aBMR_&*88GD6Q&k2jx)hhPo>=D_83--)XublYg`VHBKnF1+1FLEc=tet#? z-6`kZnrn{RmdBd<2bJ`3R&yG)ZPP#UYj8hrk;gwW}km0oW#G?H2j!j+gqNcvb|q<*17IaJ886XS>gJk20=;Z9T98o zpV|wpYImK)|NR_e^q;B89P207WShOtn-Ke6-*QIz+_|CEJ?5VK`tJswo2-z`Q9bXT zy+~HH<2LO*yKKJl&pC2hMf3D0BTw7aulhY-ebv6Zbls#~`=VF93(DQ{_DcBXXERn8 zuQ|_YFy;G8mJ4AMu6}o3E1mY;DaYSeI%V$DyEo=O`!nOsbBXzk4qNL*@tva<_7whmy2FsUAei8FK6RC{?{z`wGK=Q z?KtSnBDvhacaqtKsO_PKZ(Aa73A|>x?q>T%^@PRJUWZwsUq9)ck-FR8{~2OC7#SFu>Ka(+8kmL{npl}wTA3JV8yHv_7%aTo z^BF}$ZhlH;S|x4`7aC0bff_X6Hk4%MrWThZ<`&@A(>_&n0w~BmUHx3vIVCg!0OU1a AQvd(} diff --git a/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png b/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png deleted file mode 100644 index 1adb1412918757424e86830a0c8f0f051a9f0852..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1083 zcmeAS@N?(olHy`uVBq!ia0y~yU^D`14Ba#P!1^6 z@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2Y)RhkE)4%caKYZ?lNlJ8^*mi1Ln>~)z2lpA zIY5H-!s{(s1`V3RGtwn*dR}`VdL`1U{mr7?3eGIb%M2V84)Dk<_xl`t*`g?Fu5e`8 zlkYd{CYApF^h$*hXgGfG;H2iUeGK#VDxJJPFIV03)kggp%byp$;eK#)m&d2wH`nBE zE7vcZ5|aBMR_&*88GD6Q&k2jx)hhPo>=D_83--)XublYg`VHBKnF1+1FLEc=tet#? z-6`kZnrn{RmdBd<2bJ`3R&yG)ZPP#UYj8hrk;gwW}km0oW#G?H2j!j+gqNcvb|q<*17IaJ886XS>gJk20=;Z9T98o zpV|wpYImK)|NR_e^q;B89P207WShOtn-Ke6-*QIz+_|CEJ?5VK`tJswo2-z`Q9bXT zy+~HH<2LO*yKKJl&pC2hMf3D0BTw7aulhY-ebv6Zbls#~`=VF93(DQ{_DcBXXERn8 zuQ|_YFy;G8mJ4AMu6}o3E1mY;DaYSeI%V$DyEo=O`!nOsbBXzk4qNL*@tva<_7whmy2FsUAei8FK6RC{?{z`wGK=Q z?KtSnBDvhacaqtKsO_PKZ(Aa73A|>x?q>T%^@PRJUWZwsUq9)ck-FR8{~2OC7#SFu>Ka(+8kmL{npl}wTA3JV8yHv_7%aTo z^BF}$ZhlH;S|x4`7aC0bff_X6Hk4%MrWThZ<`&@A(>_&n0w~BmUHx3vIVCg!0OU1a AQvd(} diff --git a/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy b/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy deleted file mode 100644 index c2ae9398f7..0000000000 --- a/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy +++ /dev/null @@ -1,92 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_contemptor_head_colors", - "bboxMode":0, - "bbox_bottom":47, - "bbox_left":143, - "bbox_right":172, - "bbox_top":29, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"v1","%Name":"74c01830-4218-44ae-aa3d-aba9109cecc2","name":"74c01830-4218-44ae-aa3d-aba9109cecc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":250, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","blendMode":0,"displayName":"default","isLocked":false,"name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"spr_contemptor_head_colors", - "nineSlice":null, - "origin":9, - "parent":{ - "name":"dreadnought", - "path":"folders/Sprites/Marine Viewer/dreadnought.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_contemptor_head_colors", - "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":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"spr_contemptor_head_colors", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "seqHeight":250.0, - "seqWidth":306.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":"74c01830-4218-44ae-aa3d-aba9109cecc2","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54d5695e-8560-4098-8bd1-1686b108adbb","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, - "volume":1.0, - "xorigin":61, - "yorigin":18, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":306, -} \ No newline at end of file diff --git a/sprites/spr_dread_claw/spr_dread_claw.yy b/sprites/spr_dread_claw/spr_dread_claw.yy index 761f0f75bb..a959601858 100644 --- a/sprites/spr_dread_claw/spr_dread_claw.yy +++ b/sprites/spr_dread_claw/spr_dread_claw.yy @@ -66,25 +66,15 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":197.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":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.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/spr_dread_iron_clad/spr_dread_iron_clad.yy b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy index 2d8280e01f..193f8faabf 100644 --- a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy +++ b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy @@ -67,25 +67,15 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":197.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":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.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/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy index c2897e614c..b70a168864 100644 --- a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy +++ b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy @@ -64,16 +64,12 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":197.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":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","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/spr_dreadnought_decorations/spr_dreadnought_decorations.yy b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy index 084ec74435..85357e3a03 100644 --- a/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy +++ b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy @@ -65,22 +65,14 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":197.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":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.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/spr_gear_apoth_eye/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png b/sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png similarity index 100% rename from sprites/spr_gear_apoth_eye/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png rename to sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png diff --git a/sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png b/sprites/spr_gear_apoth/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png similarity index 73% rename from sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png rename to sprites/spr_gear_apoth/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png index 5edd5e96aa2c49ee4fa7c31e94f2d3ae3e36a5a1..5d49b591024c01165e934d56a2cb0fcb473729c3 100644 GIT binary patch delta 148 zcmcb{dX061H&eZdu7Rblky(hLxs@pp8EP9CSQ!{h*?iRc?Mt yW?ChKk%19*4Nu?Ilmazqz%`U)=B5^xB<2?2*0bq%>?$6hCI(MeKbLh*2~7Zj>4Ur?Zki@G~gOaGILXlOA>PnaO=?%kUz--)WqQF>gTe~DWM4fNZ%#C diff --git a/sprites/spr_gear_apoth/spr_gear_apoth.yy b/sprites/spr_gear_apoth/spr_gear_apoth.yy index 707bf0d30c..1e9544c73d 100644 --- a/sprites/spr_gear_apoth/spr_gear_apoth.yy +++ b/sprites/spr_gear_apoth/spr_gear_apoth.yy @@ -2,7 +2,7 @@ "$GMSprite":"v2", "%Name":"spr_gear_apoth", "bboxMode":0, - "bbox_bottom":41, + "bbox_bottom":44, "bbox_left":33, "bbox_right":129, "bbox_top":5, @@ -13,6 +13,7 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -49,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":1.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -63,16 +64,13 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":167.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":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","IsCreationKey":false,"Key":1.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/spr_gear_apoth_eye/spr_gear_apoth_eye.yy b/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy deleted file mode 100644 index 87391fe031..0000000000 --- a/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy +++ /dev/null @@ -1,92 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_gear_apoth_eye", - "bboxMode":0, - "bbox_bottom":44, - "bbox_left":85, - "bbox_right":97, - "bbox_top":32, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"v1","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":232, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"db192a8c-3604-4553-bea9-59dc5e18b44c","blendMode":0,"displayName":"default","isLocked":false,"name":"db192a8c-3604-4553-bea9-59dc5e18b44c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"spr_gear_apoth_eye", - "nineSlice":null, - "origin":9, - "parent":{ - "name":"decorations", - "path":"folders/Sprites/Marine Viewer/decorations.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_gear_apoth_eye", - "autoRecord":true, - "backdropHeight":1080, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1920, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"spr_gear_apoth_eye", - "playback":1, - "playbackSpeed":1.0, - "playbackSpeedType":1, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":167.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":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","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, - "volume":1.0, - "xorigin":0, - "yorigin":11, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":167, -} \ No newline at end of file diff --git a/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png b/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png index 5573062f6eccdf9e7e6a2ad4f88258804903b4be..fb7035010b00505d0ee5bf7a1655c8ebe333ae1c 100644 GIT binary patch delta 1733 zcmZXSdo|4Mv>3)z*VZ__n8u?)s)jb%x zdd#b>YDz>VjdbIx)+_Z&yi$w^C2T@d&t5y{{&Ua1=ljR^e9!045C0Rk&W};X02pjy(yXf@iN}M?58fbg}&*iPHF0MbUOHp;L zOS~WE5*D!DLzv?`1MTX;-oVWeL)YMG?o)Hj^ic3HygMFE-aQkEInEac;M>v77H&tlh~PW3)|`a++cX zGV!X!NXO8@2U{Fw_lZ>UL7Fd)>@_8faFmd6{NZql(X^I3n0l!ntJ_H39Oxw7L~F<< zvD|={0Ed*9*fLL>+Ssi7;=y=n#aSMWCxL$2|3L(&ka;&W79HSRKQum1aiOW?N0MFyFc5U7&-@ijvZt z{-7i7_V9e+rEA_xNr=L$;G&0#&S}Z~*|h~Td%}n0|8(33u8x1E^1G2z zB^_pRYjHwiFkQ1y-Eybr)F<&6uSQI5y0s+wS&YJBY<49yf1h9rP$PmEgTHeT$`Ek$oC(1?hRL5zh^K zPd{#%@g!&Ojf^C-4dOB>N3B(x^{IsR)%7BOmVZCpa(#Gr5gO;93N1zISS5fMjS@dA z9LVu&FnxQE*LC$DfF-^8N)F>Ixl#6VE@)fZN4f10SYj0YMlxq{55u@+0ImP7C<}~e zsl%V+h&h+nnf`UWV!hVtRcWe(8w0C9tp6<8-=k*l{lN!C; z(q*FZjgPF5I#_U^x^!b+F%Y~Z`H}Z#A(O2^)_Qw!$Z)@8M|!mXh5wn+VdXrW&D#>7 zAT!35oxm-qPNeUn(}f`?2kQm)?dl1|+M0L)Vj}5Oz9FR>0gOcmC-_^T4OzD}T?=hDfge7S zZ>9v=mLxJ6k)#=6zLp#*rul`j^`qN}ru1VEw})0d824ZzhIU89yEPvyAa89Dq4jz{ zuiyK?c4we~BX@gT$~V8i-X=M3^#HWqSl}%Cl^5{RF5c{lCJs0KC Zs{b_le;OQ`6Mp0{NKe1ZPu(ML{udZpYfu0H delta 1381 zcmZXSc~}w#7{+at+VaV(W;%n0L-PvMG{Q5l6cx>!M;=68GgCvfdDHD#hIphIPXHfK)E>I(Tvi2;Mdy4peoWt-ZCt~xeCQ-H_9XxlScv!RU)v#Ljinp+ z78%Yg&@kVuJL$F`C7j8gP z1{vX-lEkypYJ5?w@Hm>t)KCaX0$X&L`IU5=Nf%cudsf2ajS|$1vwH>{z1crk;Ve+;oHsnbti&RIM@Y_IEvmo}Q`2NK2Van2)z{;k4mdd$2r z(*%LB`ywV}7SHNC*p%anv1j<5g9)$q6y)*0cq*aO3ANI$H@#<1pJg)BO6LWO2j9Us zrF5OeP$-RSdyz??dP7ZzsJJEq!1)EqE*TApEdm2Y&&A2j*;GI% z7SJ{9F57N+K?-D`ShS3I^^@rF1M( zv~gYE8|6=V(H|x3D{h^!65S|I+%Ba?s~9W*u5lKL#8gG2r*;Jiul?)G!%s|)NA1jU zPsePN*J99pFE-$|LKpGGd5SqAUoPhAR~w>)u5S7|&hN)kEkXuk??ls|gtRG-nRT?9 zLf6!p49JeSXy@{_*mS+94sVDtxtNVRrdG`rsBl+=qYuoZ5JO~fTwSlvFHo(BJV@w%ZKg;(`|0uRW;LheMV>LThnf% z5zm@rA9{bfPYSFVJwvf<;a&>S*9c9kZ>^*BD#Rv8Z3oA%=;pSCTu+P9n|k+aaW%uc5=W8CcFU_B>K>$eW!z1oA1-c@Dk z;3HKlP6X=KxtrXN$%NU(%YnUUn)v*z3%ULEuMj$FVd)a+>|0X>!q=orpl4utbw-RM ziQFb{>@`hxn3n{J>iZF-BfMORvUts}kN`TCaUpj-Vks|SbA$f@o9axeKA|B7PCDq6 z9U&fbWMI^^JM+_YH#NtHmQZ9d8T5z1iN7>3^xFQbj1t(Y5Ly5>Cn(AQZ48Xz24~;~ zr*xrEI1~zGSdU9dNr7YRykmmUF~RVNsGzWrcqv1up|L&`rVl;k@vR~9-c}?5D+2<2 Vi_Z`kb&?z@M?0i#jrFBle*;L&!V3TZ diff --git a/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png b/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png index a28266c3d86a112c7fcc6639274f2b3fea62fd2f..245943e9a55dec9331fb690471f0e05b097aabac 100644 GIT binary patch delta 2462 zcmV;P31Rm15&aa9VOiCNk#B?RBn>)vwMSI|OUN}&szV{oD8=_Q)T8c8F~NE(gv{gfqM+dDJ1etx9U zjHe=z!FQ3+3V%m#HTMP#XcxA>A@hH`JlS3Ku zH-z-KPE^krqq`)W?59yWlGUFy*bL1p-jmW(p2vS5}MK=&N<53LTMV#msU+XD%h!hYVjkYJl5)*ajydyvZZ*xy0#W^5j%RL~bu{tm~V){FKXcy%%)r`FSg6>VK-{THeW%(_Ta<1fa*Pg3Eb1YY1rdfSss&QC(#xIq_pM)zEsC zyuG~XRneU5j(wax^Z6ACr-(R%m~w1rtDYkM0BTmY9|AfbJ)Bv(DZO!1@1*El%XWPz zB7Y7;t}KUj>Cy`*QaR0l=w15MJ#`;_xt=Mekf5!!zayB1^un2|8?yyc{S0-#F6#M1 zVfV}k!~|^>`Fu>2>wD`W;trd+Gjw}-GwDO&8f&Wi9bG#?t6cVO-3*9%d#Xm7Zkg&Q z=hznInBh!TO>A?JwvbM(nmQFqJ)ruBgMU5mWwCbaspk0fVCaDfnd5wW|E=?}NBc+p z?Y(TA>nkyziuAIKIc-%_4~QNd^FyFQ`SkI%bNR2|tVN_BQrr4$l^V;Cb7JukS2gyuExXjwD5RAwoURi*e8C*U{5#(VfvUMIws0n&Vt>&q znyqV96>|);f{KWDyh#OJj;!;Xw((|(F4k5p3FY!+>(*W4O*1r8s-|LAPqT75CgVdc zF~g;3W|VczX&d9Yc3M)gRZ7pe(-%Db{8j=wgJLIsnBz{<>o@D@3i|Z%bvLbKTbIdk z9N!ka)^ef<0WB5A&w&7(!OW9wL!qTRYuYKO@7;lOef`wo#Z6wK!@AIkHW553EHws|1W zHV>?i&GCUi9@)m6=9G@BYU%Tw&tE>2wr#uHA|k)O`m=kk8OUdw2lCtYuYWIl?R)9g zNtIl_ES1ytRbbm$LOyNVO53(wNL`h3hiFw zB1OLJB-sM0{^tHK-?jg|_}h7^-}e_kcppcdvR6*?n~~;WMHSY&XZH@qpE_H2uEv=v zm}UUged@LdRdZ>A!kOv|Z?-dr4#IkI+L{4XV^Do8s)DJ)r|4lcAAg&={ha(!-e5Qz zY2^CdR<7S|M_-Xcv3+G%-R_=qaoUP}`4XG!Ut6WL{Z4njT&{-eoicX)ZYv@p>$6Q% zNPU+->|HkI;jAY)DXnf_+yw7%nBBN-k3ICN z#%3sEhc3t?IGkqnRP-vUp66SJtAgHM-n8bpG=yF?L#ri~a(@}3DyJ);BH{JNfaa^WOBB?e$Pm=V4ZXcI>!qeYWvd zsks_hub$i8m57LZc)#l&*8}Q$UHore<`Hyk-Bl5l_1Q)~yx(<=ue04(QX`FQcUN7t z)Pp&Map=5)_SStSIqrS(jv! z@Fp{)>hE)#QY{H(U93|{AyYZ3(!_)ycQtLKi4LW{Z2|MK>i6dg>Ch1;g1Ia?8h>c;*u44Jl#?}vmTkF@P%cESh8nD* zy0IsKj950oT#%fN6&29b2<7sXXtd(jVkel#p;W^asiK7PxRh+btN|sM$7ha4Oxn#8 z%HuUxV+PNOModW&%p)^rgL;q6|FPT2$Ma9!HJi-GD|rpbXz+?38LdA5SgYg5^H0`4 zB7c})k6Iend8WOid#`1?kx@;J9C|(Ynzk7k)!5Lkkk+`Z$moAKT%jZT+bPTd001R) zMObuXVRU6WV{&C-bY%cCFfuhQFgPtRG*mJ&Ix{djH8(3TFgh?W4-)4+0000bbVXQn zWMOn=I&E)cX=Zr#$G7vg5Fgi6iD=;uRFfe{kUxAaf2qGRbGCDIb cIyE;dFfckWFezGoUH||907*qoM6N<$f)hvgqW}N^ delta 2013 zcmV<32O{|W6!a00VOIy|Nkl@u*ZN4eV6tL@)Es;P)gbo zT6YO;%o0M5eTY6m`!0nVoMZ69o@X!BM3(=OXFQTdntVSc#EG35d-U^P8qIhr0+GRf ze*ge5akH_Xz#dIy&leGu*w}3#7qZy8!}+c#%j#1P=*5O9nM7 zv?!HwAq)9>b0fDWcUth&$Ghvy^m-A|f1^ap-3euvP=(x{+;x7e`zEl~ZJrk)tw8KX zN;0OjmvP9lsHAm@(KtJElrcjYQy`?Vwgn;@(jeYB%F;sV+Vgw~X(0}2h+cD)B?p$d z(z5kwfZpTDzI)j@bU8FiNXzg?hsQL(zjhk1OW6ACWv6D|EZTE-Uz2rz`}&bre`qRc z@N`g#J4gH8EKEa{L)*~Frh`h*_w~@-kH_A?lMdxjOg-giHgG$pB$Q!P&wRGRDMBc_ zu(lE5OsEZKZF7{lc_!`&XF}eoq|mg>L<hNARqqRCAPvocTVslICk4itOF`LKbp# zHWv|*^>U@IZ|L%4F3-0u=+@H|{PP7r)pJKW?U*yy#y8>7 zem?YE&7-q<@T3#e$yCmn{O;OQHE4?E+RJpSZ=Y)1H`sLPd2~7PV=&Xuc9mQ&S36ZS z<+}Uc&z|}CvV>Dayg`gPHq@%8NH~C&nf66M$76>xNjGITZtR^Dn{U~^e>X*s!;mxO zur6JC23abn8xXroAG)U=VlOu^#ndHeGwbgNW+pq~Ox2BPfiz$Hx?dmj_v#<{-6@4y~Ft6G}UvfA*V$J@2}x-FmD!K06q8V7kn4UO&C|-gmk=-F?2xg?D{9 z=2H=0k};=NHSK`d!ExUNCX{bqfAcQ?^6FSbc0;PIPpj0ZL((y)*3FvVYt`)f>9xFl z{Vf7cHF8f2UaNil%j~reYq# zt)LydPxQyXvQ=wh{MNhs@+tXubuH{H+-shWmcJ>AObnT+ppi5V_MGoqwp zPHl|m+i8hKtCWFpXDE2~`K<(W1ldmfaL1jl%d6ww74+@vZ|$^_wl0_FIKCFVMmbT0 zfM%97oW3qSHM=Vhe^qJaN^*^OKJ175lI{?RgpaM~T6bu@1hHIMCgJU$-Lc>4=JcR0 z-7sCdd$dS9wvM`F?beN4J4D)>1NF%E86sm}FyDWCDephN3@+o{hZpkh!wdDkG2ReJ zBiWeKozn4DEqk8x{l}NmG);S3MC9|Q@9ksVK)(C%LcaX{f8&0yeIxBUsgm_eQaQDc z0&8apg)~hgP1Cd?^;OD!+{31XwjNn_hyb|Wj32_eVNMn}_swA6W)Hm%$)}P;`gOB*H}28`>aIsbyvOsYnspiFq6&TIJooJ& ziHJPAc-}nvfAdkZUas2PA|md0s%AZsh10#5g0G7g5qbRTiCkVC?;MI0x!+0B0&4!| z>6^crU*|u)r}{m+cpkhTWlCN--A_ikhZRj&AHRCCHU6||-MJZOnqayCG`};qMW~v! z$vV%eoiVf(){A-L2Goo}?Xjo{rU{>6hta)nXfQeXe|BQB} zIIfkHSMqM%zMhf$-5!U!Hk*w+e)FW!zKiHxxLYl$nsw9WIiruO%o*ifrjAVY+_y|^ z=f|#|f9wR+FUusni1oivSXbt7%+}|t&TkC28`t*O31;20h10Mv9b;QBSB*O^?ZU2_ zRLg0}9!^6$8Msd%&28o~r)!jOZhd%cd4IcW<l ze@ZCp5wmfM4=BN`ONs_6uA3*6bxPGx#Z*y(S+A6hHEKW!W&LtATJ~<9U`|7>hRae# z3FWlpY`~-eC79DQMk7Y;<_YC=jn$ZYt7v--r9g-Y=CqC3px%HkWFcQ~ZshjluDvR< zdw(IX0SS%y(cszdFSR<}p4_Q_L@*zYDpDGEr;7T%7xui7P)Uv4^?L9nJ!d3TVnh2v zTH

LjMD6cxN7cyxVV++X){MF*Q0eFgh|dD=;uRFfdZo15T3+3Lg?NH99gdIx;mY vFfckWFe8b(@{>IZA|5d{Ix;XiGBqnOFgh?Wbex(k00000NkvXXu0mjfQo<48 diff --git a/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png index 5573062f6eccdf9e7e6a2ad4f88258804903b4be..fb7035010b00505d0ee5bf7a1655c8ebe333ae1c 100644 GIT binary patch delta 1733 zcmZXSdo|4Mv>3)z*VZ__n8u?)s)jb%x zdd#b>YDz>VjdbIx)+_Z&yi$w^C2T@d&t5y{{&Ua1=ljR^e9!045C0Rk&W};X02pjy(yXf@iN}M?58fbg}&*iPHF0MbUOHp;L zOS~WE5*D!DLzv?`1MTX;-oVWeL)YMG?o)Hj^ic3HygMFE-aQkEInEac;M>v77H&tlh~PW3)|`a++cX zGV!X!NXO8@2U{Fw_lZ>UL7Fd)>@_8faFmd6{NZql(X^I3n0l!ntJ_H39Oxw7L~F<< zvD|={0Ed*9*fLL>+Ssi7;=y=n#aSMWCxL$2|3L(&ka;&W79HSRKQum1aiOW?N0MFyFc5U7&-@ijvZt z{-7i7_V9e+rEA_xNr=L$;G&0#&S}Z~*|h~Td%}n0|8(33u8x1E^1G2z zB^_pRYjHwiFkQ1y-Eybr)F<&6uSQI5y0s+wS&YJBY<49yf1h9rP$PmEgTHeT$`Ek$oC(1?hRL5zh^K zPd{#%@g!&Ojf^C-4dOB>N3B(x^{IsR)%7BOmVZCpa(#Gr5gO;93N1zISS5fMjS@dA z9LVu&FnxQE*LC$DfF-^8N)F>Ixl#6VE@)fZN4f10SYj0YMlxq{55u@+0ImP7C<}~e zsl%V+h&h+nnf`UWV!hVtRcWe(8w0C9tp6<8-=k*l{lN!C; z(q*FZjgPF5I#_U^x^!b+F%Y~Z`H}Z#A(O2^)_Qw!$Z)@8M|!mXh5wn+VdXrW&D#>7 zAT!35oxm-qPNeUn(}f`?2kQm)?dl1|+M0L)Vj}5Oz9FR>0gOcmC-_^T4OzD}T?=hDfge7S zZ>9v=mLxJ6k)#=6zLp#*rul`j^`qN}ru1VEw})0d824ZzhIU89yEPvyAa89Dq4jz{ zuiyK?c4we~BX@gT$~V8i-X=M3^#HWqSl}%Cl^5{RF5c{lCJs0KC Zs{b_le;OQ`6Mp0{NKe1ZPu(ML{udZpYfu0H delta 1381 zcmZXSc~}w#7{+at+VaV(W;%n0L-PvMG{Q5l6cx>!M;=68GgCvfdDHD#hIphIPXHfK)E>I(Tvi2;Mdy4peoWt-ZCt~xeCQ-H_9XxlScv!RU)v#Ljinp+ z78%Yg&@kVuJL$F`C7j8gP z1{vX-lEkypYJ5?w@Hm>t)KCaX0$X&L`IU5=Nf%cudsf2ajS|$1vwH>{z1crk;Ve+;oHsnbti&RIM@Y_IEvmo}Q`2NK2Van2)z{;k4mdd$2r z(*%LB`ywV}7SHNC*p%anv1j<5g9)$q6y)*0cq*aO3ANI$H@#<1pJg)BO6LWO2j9Us zrF5OeP$-RSdyz??dP7ZzsJJEq!1)EqE*TApEdm2Y&&A2j*;GI% z7SJ{9F57N+K?-D`ShS3I^^@rF1M( zv~gYE8|6=V(H|x3D{h^!65S|I+%Ba?s~9W*u5lKL#8gG2r*;Jiul?)G!%s|)NA1jU zPsePN*J99pFE-$|LKpGGd5SqAUoPhAR~w>)u5S7|&hN)kEkXuk??ls|gtRG-nRT?9 zLf6!p49JeSXy@{_*mS+94sVDtxtNVRrdG`rsBl+=qYuoZ5JO~fTwSlvFHo(BJV@w%ZKg;(`|0uRW;LheMV>LThnf% z5zm@rA9{bfPYSFVJwvf<;a&>S*9c9kZ>^*BD#Rv8Z3oA%=;pSCTu+P9n|k+aaW%uc5=W8CcFU_B>K>$eW!z1oA1-c@Dk z;3HKlP6X=KxtrXN$%NU(%YnUUn)v*z3%ULEuMj$FVd)a+>|0X>!q=orpl4utbw-RM ziQFb{>@`hxn3n{J>iZF-BfMORvUts}kN`TCaUpj-Vks|SbA$f@o9axeKA|B7PCDq6 z9U&fbWMI^^JM+_YH#NtHmQZ9d8T5z1iN7>3^xFQbj1t(Y5Ly5>Cn(AQZ48Xz24~;~ zr*xrEI1~zGSdU9dNr7YRykmmUF~RVNsGzWrcqv1up|L&`rVl;k@vR~9-c}?5D+2<2 Vi_Z`kb&?z@M?0i#jrFBle*;L&!V3TZ diff --git a/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png index a28266c3d86a112c7fcc6639274f2b3fea62fd2f..245943e9a55dec9331fb690471f0e05b097aabac 100644 GIT binary patch delta 2462 zcmV;P31Rm15&aa9VOiCNk#B?RBn>)vwMSI|OUN}&szV{oD8=_Q)T8c8F~NE(gv{gfqM+dDJ1etx9U zjHe=z!FQ3+3V%m#HTMP#XcxA>A@hH`JlS3Ku zH-z-KPE^krqq`)W?59yWlGUFy*bL1p-jmW(p2vS5}MK=&N<53LTMV#msU+XD%h!hYVjkYJl5)*ajydyvZZ*xy0#W^5j%RL~bu{tm~V){FKXcy%%)r`FSg6>VK-{THeW%(_Ta<1fa*Pg3Eb1YY1rdfSss&QC(#xIq_pM)zEsC zyuG~XRneU5j(wax^Z6ACr-(R%m~w1rtDYkM0BTmY9|AfbJ)Bv(DZO!1@1*El%XWPz zB7Y7;t}KUj>Cy`*QaR0l=w15MJ#`;_xt=Mekf5!!zayB1^un2|8?yyc{S0-#F6#M1 zVfV}k!~|^>`Fu>2>wD`W;trd+Gjw}-GwDO&8f&Wi9bG#?t6cVO-3*9%d#Xm7Zkg&Q z=hznInBh!TO>A?JwvbM(nmQFqJ)ruBgMU5mWwCbaspk0fVCaDfnd5wW|E=?}NBc+p z?Y(TA>nkyziuAIKIc-%_4~QNd^FyFQ`SkI%bNR2|tVN_BQrr4$l^V;Cb7JukS2gyuExXjwD5RAwoURi*e8C*U{5#(VfvUMIws0n&Vt>&q znyqV96>|);f{KWDyh#OJj;!;Xw((|(F4k5p3FY!+>(*W4O*1r8s-|LAPqT75CgVdc zF~g;3W|VczX&d9Yc3M)gRZ7pe(-%Db{8j=wgJLIsnBz{<>o@D@3i|Z%bvLbKTbIdk z9N!ka)^ef<0WB5A&w&7(!OW9wL!qTRYuYKO@7;lOef`wo#Z6wK!@AIkHW553EHws|1W zHV>?i&GCUi9@)m6=9G@BYU%Tw&tE>2wr#uHA|k)O`m=kk8OUdw2lCtYuYWIl?R)9g zNtIl_ES1ytRbbm$LOyNVO53(wNL`h3hiFw zB1OLJB-sM0{^tHK-?jg|_}h7^-}e_kcppcdvR6*?n~~;WMHSY&XZH@qpE_H2uEv=v zm}UUged@LdRdZ>A!kOv|Z?-dr4#IkI+L{4XV^Do8s)DJ)r|4lcAAg&={ha(!-e5Qz zY2^CdR<7S|M_-Xcv3+G%-R_=qaoUP}`4XG!Ut6WL{Z4njT&{-eoicX)ZYv@p>$6Q% zNPU+->|HkI;jAY)DXnf_+yw7%nBBN-k3ICN z#%3sEhc3t?IGkqnRP-vUp66SJtAgHM-n8bpG=yF?L#ri~a(@}3DyJ);BH{JNfaa^WOBB?e$Pm=V4ZXcI>!qeYWvd zsks_hub$i8m57LZc)#l&*8}Q$UHore<`Hyk-Bl5l_1Q)~yx(<=ue04(QX`FQcUN7t z)Pp&Map=5)_SStSIqrS(jv! z@Fp{)>hE)#QY{H(U93|{AyYZ3(!_)ycQtLKi4LW{Z2|MK>i6dg>Ch1;g1Ia?8h>c;*u44Jl#?}vmTkF@P%cESh8nD* zy0IsKj950oT#%fN6&29b2<7sXXtd(jVkel#p;W^asiK7PxRh+btN|sM$7ha4Oxn#8 z%HuUxV+PNOModW&%p)^rgL;q6|FPT2$Ma9!HJi-GD|rpbXz+?38LdA5SgYg5^H0`4 zB7c})k6Iend8WOid#`1?kx@;J9C|(Ynzk7k)!5Lkkk+`Z$moAKT%jZT+bPTd001R) zMObuXVRU6WV{&C-bY%cCFfuhQFgPtRG*mJ&Ix{djH8(3TFgh?W4-)4+0000bbVXQn zWMOn=I&E)cX=Zr#$G7vg5Fgi6iD=;uRFfe{kUxAaf2qGRbGCDIb cIyE;dFfckWFezGoUH||907*qoM6N<$f)hvgqW}N^ delta 2013 zcmV<32O{|W6!a00VOIy|Nkl@u*ZN4eV6tL@)Es;P)gbo zT6YO;%o0M5eTY6m`!0nVoMZ69o@X!BM3(=OXFQTdntVSc#EG35d-U^P8qIhr0+GRf ze*ge5akH_Xz#dIy&leGu*w}3#7qZy8!}+c#%j#1P=*5O9nM7 zv?!HwAq)9>b0fDWcUth&$Ghvy^m-A|f1^ap-3euvP=(x{+;x7e`zEl~ZJrk)tw8KX zN;0OjmvP9lsHAm@(KtJElrcjYQy`?Vwgn;@(jeYB%F;sV+Vgw~X(0}2h+cD)B?p$d z(z5kwfZpTDzI)j@bU8FiNXzg?hsQL(zjhk1OW6ACWv6D|EZTE-Uz2rz`}&bre`qRc z@N`g#J4gH8EKEa{L)*~Frh`h*_w~@-kH_A?lMdxjOg-giHgG$pB$Q!P&wRGRDMBc_ zu(lE5OsEZKZF7{lc_!`&XF}eoq|mg>L<hNARqqRCAPvocTVslICk4itOF`LKbp# zHWv|*^>U@IZ|L%4F3-0u=+@H|{PP7r)pJKW?U*yy#y8>7 zem?YE&7-q<@T3#e$yCmn{O;OQHE4?E+RJpSZ=Y)1H`sLPd2~7PV=&Xuc9mQ&S36ZS z<+}Uc&z|}CvV>Dayg`gPHq@%8NH~C&nf66M$76>xNjGITZtR^Dn{U~^e>X*s!;mxO zur6JC23abn8xXroAG)U=VlOu^#ndHeGwbgNW+pq~Ox2BPfiz$Hx?dmj_v#<{-6@4y~Ft6G}UvfA*V$J@2}x-FmD!K06q8V7kn4UO&C|-gmk=-F?2xg?D{9 z=2H=0k};=NHSK`d!ExUNCX{bqfAcQ?^6FSbc0;PIPpj0ZL((y)*3FvVYt`)f>9xFl z{Vf7cHF8f2UaNil%j~reYq# zt)LydPxQyXvQ=wh{MNhs@+tXubuH{H+-shWmcJ>AObnT+ppi5V_MGoqwp zPHl|m+i8hKtCWFpXDE2~`K<(W1ldmfaL1jl%d6ww74+@vZ|$^_wl0_FIKCFVMmbT0 zfM%97oW3qSHM=Vhe^qJaN^*^OKJ175lI{?RgpaM~T6bu@1hHIMCgJU$-Lc>4=JcR0 z-7sCdd$dS9wvM`F?beN4J4D)>1NF%E86sm}FyDWCDephN3@+o{hZpkh!wdDkG2ReJ zBiWeKozn4DEqk8x{l}NmG);S3MC9|Q@9ksVK)(C%LcaX{f8&0yeIxBUsgm_eQaQDc z0&8apg)~hgP1Cd?^;OD!+{31XwjNn_hyb|Wj32_eVNMn}_swA6W)Hm%$)}P;`gOB*H}28`>aIsbyvOsYnspiFq6&TIJooJ& ziHJPAc-}nvfAdkZUas2PA|md0s%AZsh10#5g0G7g5qbRTiCkVC?;MI0x!+0B0&4!| z>6^crU*|u)r}{m+cpkhTWlCN--A_ikhZRj&AHRCCHU6||-MJZOnqayCG`};qMW~v! z$vV%eoiVf(){A-L2Goo}?Xjo{rU{>6hta)nXfQeXe|BQB} zIIfkHSMqM%zMhf$-5!U!Hk*w+e)FW!zKiHxxLYl$nsw9WIiruO%o*ifrjAVY+_y|^ z=f|#|f9wR+FUusni1oivSXbt7%+}|t&TkC28`t*O31;20h10Mv9b;QBSB*O^?ZU2_ zRLg0}9!^6$8Msd%&28o~r)!jOZhd%cd4IcW<l ze@ZCp5wmfM4=BN`ONs_6uA3*6bxPGx#Z*y(S+A6hHEKW!W&LtATJ~<9U`|7>hRae# z3FWlpY`~-eC79DQMk7Y;<_YC=jn$ZYt7v--r9g-Y=CqC3px%HkWFcQ~ZshjluDvR< zdw(IX0SS%y(cszdFSR<}p4_Q_L@*zYDpDGEr;7T%7xui7P)Uv4^?L9nJ!d3TVnh2v zTH

LjMD6cxN7cyxVV++X){MF*Q0eFgh|dD=;uRFfdZo15T3+3Lg?NH99gdIx;mY vFfckWFe8b(@{>IZA|5d{Ix;XiGBqnOFgh?Wbex(k00000NkvXXu0mjfQo<48 diff --git a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy index f33cbde28f..b8a251d175 100644 --- a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy +++ b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy @@ -63,16 +63,12 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, - "seqWidth":164.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":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","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/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png b/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png deleted file mode 100644 index 1abd8ff743b7eaefc238013f78115001ff038ee9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slEO3u^8F{I+w+v|>e zOo{?52ac70_&@z;|Hr24g6orAE`$gQ9m;gFI-mm7Ogva~Jxu(AeAV3V@6JuTS{3@r zWIZ!?e6g$#}ATc~H~$A5pOeO|6gb*0K<&GR$neevIEslLK6>ej|K-!F?9 zFL7*Kn6AJoOuU`cSNUMMEkjPS+dq+KTs}b4RZCnWN>UO_QmvAUQh^kMk%5t^u7QQF zfk}v=iIt(Hm5Hggfq|8QfzGXY?I;>@^HVa@DsgLwZCA4fYS4h&P?DLOT3nKtTYy^+ T*Ch5QAU}J$`njxgN@xNA<^z1# diff --git a/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png b/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png deleted file mode 100644 index e1666a53138feb53bb6e840b6bf05f32ddc2bba8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(`R(cA7*cWT?R7)0 z0}28x4qyM*?-QArF!_{l@{G(aHq*Wy09i@`cwkfdoxxt{aO^tHmKn-PFVglVPkp;& zTQx();yIqbw$=DO(^Q}TbmsGqicBP!N`0kbyBLZYS@|Sx{m=m#u3F+6QIe8al4_M) zlnSI6j0}uSbqy?Z4NO7|O{@$ptxQa{4GgRd40LYIYe&(Lo1c=IR*73fY`dB@P=f~C fhLX(O)Z&uF+ydNsxF)eb0eRWe)z4*}Q$iB}1ek1( diff --git a/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png deleted file mode 100644 index 58dc547f3d7221096434d831dcebb7068476523b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slEO3u^8F{I+w+v|>e zOo{?52ac70_&@z;|Hr24g6orAE`$gQ9m;gFI-mm7Ogva~Jxu(AeAV3V@6JuTS{3@r zWIZ!?e6g$#}ATc~H~$A5pOeO|6gb*0K<&GR$neevIEslLK6>ej|K-!F?9 zFL7*Kn6AJoOuU`cSNUMMEkjPS+dq+KTs}b4RZCnWN>UO_QmvAUQh^kMk%5tku7Rnp zk#UHTk(Gh5m9e3=fq|8Q!Nq;E&ZB6^%}>cptHiBg!DFRjpau=N4JDbmsl_FUxdpiO TeE-J02IOZ?S3j3^P645bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(`R(cA7*cWT?R7)0 z0}28x4qyM*?-QArF!_{l@{G(aHq*Wy09i@`cwkfdoxxt{aO^tHmKn-PFVglVPkp;& zTQx();yIqbw$=DO(^Q}TbmsGqicBP!N`0kbyBLZYS@|Sx{m=m#u3F+6QIe8al4_M) zlnSI6j0}uSbPY^(jf_K#46RJftc(n_4GgRd3?^QmrHi5=H$NpatrE9}2VF`Nff_X6 fHk4%MrWThZ<`&@Avwc3ZAIQs|u6{1-oD!M45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slE%E;5jF{I+w+v^v3 zn+!x8E?#>faPHBcGlv9JuIyiyY0$93!S=a$MdPz&OB8|ni2-v0-sHXXDUL3>`X43JsR!C z<~{g-BEQy6GC(#<^496+tADecysm3|!QuxocGFzV0eu_B6D?N1L$`}>1zM(B;u=ws zl30>zm0Xkxq!^40j7)S5OmvNmLyQcqObo3|jkFC6tPBi(*dF_Xq9HdwB{QuOw}#Gy mItQQz4Y&;@nYpROC5gEOxb@sCjh_$H!{F)a=d#Wzp$PymCyliL diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png deleted file mode 100644 index ca49a8f02c93d50d9dab93b0521d29488a02b046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(IqvD=7*cWT?Lk9E zAn(wEul~85{tJN2Aq6U=j=f`G%!t0W8R%@)64!{5l*E!$tK_0oAjM#0U}U0eV4`be z9Aac>WnyS$YNTyoU}a$N!}i!86b-rgDVb@NxHWVp)Hwh(XuxeK$;?eHE=kNSz^&(A SY5aVk9tKZWKbLh*2~7aagHe?L diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png deleted file mode 100644 index ca49a8f02c93d50d9dab93b0521d29488a02b046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(IqvD=7*cWT?Lk9E zAn(wEul~85{tJN2Aq6U=j=f`G%!t0W8R%@)64!{5l*E!$tK_0oAjM#0U}U0eV4`be z9Aac>WnyS$YNTyoU}a$N!}i!86b-rgDVb@NxHWVp)Hwh(XuxeK$;?eHE=kNSz^&(A SY5aVk9tKZWKbLh*2~7aagHe?L diff --git a/sprites/spr_sgt_forehead/spr_sgt_forehead.yy b/sprites/spr_sgt_forehead/spr_sgt_forehead.yy deleted file mode 100644 index 38ebdd4f70..0000000000 --- a/sprites/spr_sgt_forehead/spr_sgt_forehead.yy +++ /dev/null @@ -1,96 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_sgt_forehead", - "bboxMode":0, - "bbox_bottom":78, - "bbox_left":79, - "bbox_right":87, - "bbox_top":70, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":272, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"4ff43f57-b34a-4219-8298-0399265c623b","blendMode":0,"displayName":"default","isLocked":false,"name":"4ff43f57-b34a-4219-8298-0399265c623b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"spr_sgt_forehead", - "nineSlice":null, - "origin":9, - "parent":{ - "name":"decorations", - "path":"folders/Sprites/Marine Viewer/decorations.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_sgt_forehead", - "autoRecord":true, - "backdropHeight":1080, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1920, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":2.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"spr_sgt_forehead", - "playback":1, - "playbackSpeed":1.0, - "playbackSpeedType":1, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "seqHeight":272.0, - "seqWidth":167.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":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.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":0, - "yorigin":51, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":167, -} \ No newline at end of file diff --git a/sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png b/sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png deleted file mode 100644 index 78ae7850ce221d89cd38975f2fcce7baa0a28d89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4878 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 ay>PCN|Fce1ipZ;faYE@D>X5Xp!~O?}eGgRt diff --git a/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png b/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png deleted file mode 100644 index 78ae7850ce221d89cd38975f2fcce7baa0a28d89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4878 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 ay>PCN|Fce1ipZ;faYE@D>X5Xp!~O?}eGgRt diff --git a/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy b/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy deleted file mode 100644 index 5d386c8d61..0000000000 --- a/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy +++ /dev/null @@ -1,92 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_twl_Volkite_Culverins", - "bboxMode":0, - "bbox_bottom":173, - "bbox_left":203, - "bbox_right":287, - "bbox_top":77, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"v1","%Name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":250, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","blendMode":0,"displayName":"default","isLocked":false,"name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"spr_twl_Volkite_Culverins", - "nineSlice":null, - "origin":9, - "parent":{ - "name":"dreadnought", - "path":"folders/Sprites/Marine Viewer/dreadnought.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_twl_Volkite_Culverins", - "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":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"spr_twl_Volkite_Culverins", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "seqHeight":250.0, - "seqWidth":306.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":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a3b8ccb-c022-4cad-95b2-9d1f0d2d8c12","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, - "volume":1.0, - "xorigin":61, - "yorigin":18, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":306, -} \ No newline at end of file From feaac3936aa1cdd5801ebb9d91ebad469d53b287 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 7 Aug 2025 15:25:21 +0100 Subject: [PATCH 07/13] Reapply "Merge branch 'Contemptor'" This reverts commit 01c15f38b6857aa236abb479abd763a78cc941b7. --- ChapterMaster.yyp | 7 + objects/obj_shop/Create_0.gml | 26 +- objects/obj_turn_end/Draw_0.gml | 175 +----- objects/obj_turn_end/Draw_64.gml | 40 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 574 ++++++++++-------- .../scr_apothecary_ground.gml | 2 +- .../scr_culture_visuals.gml | 221 ++++++- .../scr_draw_unit_image.gml | 166 +---- .../scr_get_item_names/scr_get_item_names.gml | 5 +- .../scr_initialize_custom.gml | 1 + .../scr_marine_struct/scr_marine_struct.gml | 12 +- .../scr_reequip_units/scr_reequip_units.gml | 25 +- scripts/scr_roster/scr_roster.gml | 9 +- .../scr_ui_display_weapons.gml | 3 + scripts/scr_ui_settings/scr_ui_settings.gml | 2 +- .../scr_unit_equip_functions.gml | 2 +- scripts/scr_weapon/scr_weapon.gml | 61 ++ .../0ca30034-8ae6-44ea-ab2a-6277d1920908.png | Bin 0 -> 868 bytes .../587d63a4-32c8-4617-9c28-59a8a099c2c1.png | Bin 0 -> 1107 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 0 -> 868 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 0 -> 1107 bytes .../spr_combat_shield_bottom_part.yy | 96 +++ .../8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png | Bin 0 -> 3246 bytes .../be470e13-bbeb-41d1-ae61-263c91abbae3.png | Bin 0 -> 3246 bytes .../spr_contemptor_CCW/spr_contemptor_CCW.yy | 92 +++ .../d55f9e41-41e0-43bd-b40c-86d963212769.png | Bin 0 -> 10643 bytes .../c511d01c-c558-46fa-b06f-82950d47dfc4.png | Bin 0 -> 10643 bytes .../spr_contemptor_chasis_colors.yy | 92 +++ .../74c01830-4218-44ae-aa3d-aba9109cecc2.png | Bin 0 -> 1083 bytes .../b113086c-f660-4cc2-bbdb-b89f64979d6b.png | Bin 0 -> 1083 bytes .../spr_contemptor_head_colors.yy | 92 +++ sprites/spr_dread_claw/spr_dread_claw.yy | 18 +- .../spr_dread_iron_clad.yy | 18 +- .../spr_dreadnought_chasis_colors.yy | 6 +- .../spr_dreadnought_decorations.yy | 14 +- sprites/spr_gear_apoth/spr_gear_apoth.yy | 12 +- .../3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png | Bin 726 -> 726 bytes .../db192a8c-3604-4553-bea9-59dc5e18b44c.png | Bin .../spr_gear_apoth_eye/spr_gear_apoth_eye.yy | 92 +++ .../350bde68-1664-48e8-97c4-7cff3c59b4ae.png | Bin 1971 -> 1596 bytes .../587d63a4-32c8-4617-9c28-59a8a099c2c1.png | Bin 2685 -> 2292 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 1971 -> 1596 bytes .../5cc2322f-a426-43f4-bc78-5cc25edf9210.png | Bin 2685 -> 2292 bytes sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy | 6 +- .../3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png | Bin 0 -> 555 bytes .../61531cde-cd44-4806-ae39-3c63f51d65de.png | Bin 0 -> 520 bytes .../4ff43f57-b34a-4219-8298-0399265c623b.png | Bin 0 -> 555 bytes .../4ff43f57-b34a-4219-8298-0399265c623b.png | Bin 0 -> 520 bytes .../a4c8b294-e4be-4fef-8912-4d706c9cec44.png | Bin 0 -> 575 bytes .../b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png | Bin 0 -> 468 bytes .../d292644f-2a3b-4981-868a-a423161e3739.png | Bin 0 -> 468 bytes sprites/spr_sgt_forehead/spr_sgt_forehead.yy | 96 +++ .../d532989d-6b36-48dc-9ccb-1daf433cbb1f.png | Bin 0 -> 4878 bytes .../1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png | Bin 0 -> 4878 bytes .../spr_twl_Volkite_Culverins.yy | 92 +++ 55 files changed, 1441 insertions(+), 616 deletions(-) create mode 100644 sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png create mode 100644 sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png create mode 100644 sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png create mode 100644 sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png create mode 100644 sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy create mode 100644 sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png create mode 100644 sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png create mode 100644 sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy create mode 100644 sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png create mode 100644 sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png create mode 100644 sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy create mode 100644 sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png create mode 100644 sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png create mode 100644 sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy rename sprites/{spr_gear_apoth => spr_gear_apoth_eye}/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png (73%) rename sprites/{spr_gear_apoth => spr_gear_apoth_eye}/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png (100%) create mode 100644 sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy create mode 100644 sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png create mode 100644 sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png create mode 100644 sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png create mode 100644 sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png create mode 100644 sprites/spr_sgt_forehead/spr_sgt_forehead.yy create mode 100644 sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png create mode 100644 sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png create mode 100644 sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 09fa95f3cb..c0f521d007 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1103,8 +1103,12 @@ {"id":{"name":"spr_clothing_colors","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},}, {"id":{"name":"spr_cm_specialty","path":"sprites/spr_cm_specialty/spr_cm_specialty.yy",},}, {"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},}, + {"id":{"name":"spr_combat_shield_bottom_part","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},}, {"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, + {"id":{"name":"spr_contemptor_CCW","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},}, + {"id":{"name":"spr_contemptor_chasis_colors","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},}, + {"id":{"name":"spr_contemptor_head_colors","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},}, {"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},}, {"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},}, {"id":{"name":"spr_creation_check","path":"sprites/spr_creation_check/spr_creation_check.yy",},}, @@ -1202,6 +1206,7 @@ {"id":{"name":"spr_formation_splash","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},}, {"id":{"name":"spr_fur_tabbard","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},}, {"id":{"name":"spr_fur_tail_topknot","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},}, + {"id":{"name":"spr_gear_apoth_eye","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},}, {"id":{"name":"spr_gear_apoth","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},}, {"id":{"name":"spr_gear_chap","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},}, {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},}, @@ -1534,6 +1539,7 @@ {"id":{"name":"spr_servo_harness","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},}, {"id":{"name":"spr_settings_bg","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},}, {"id":{"name":"spr_settings_button","path":"sprites/spr_settings_button/spr_settings_button.yy",},}, + {"id":{"name":"spr_sgt_forehead","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},}, {"id":{"name":"spr_ship_aconite","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},}, {"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},}, {"id":{"name":"spr_ship_apoc","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},}, @@ -1651,6 +1657,7 @@ {"id":{"name":"spr_tooltip1","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},}, {"id":{"name":"spr_torpedo_board","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},}, {"id":{"name":"spr_torpedo","path":"sprites/spr_torpedo/spr_torpedo.yy",},}, + {"id":{"name":"spr_twl_Volkite_Culverins","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},}, {"id":{"name":"spr_ui_but_1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},}, {"id":{"name":"spr_ui_but_2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},}, {"id":{"name":"spr_ui_but_3","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},}, diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 8fa9d20615..fd20a76f1a 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -558,9 +558,8 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; - nobuy[i] = 1; - - i += 1; + nobuy[i] = 1; + i += 1; nobuy[i] = 1; item[i] = "Volkite Charger"; item_stocked[i] = scr_item_count(item[i]); @@ -659,7 +658,26 @@ if (shop = "equipment") { item_cost[i] = 0; forge_cost[i] = 0; i += 1; - + item[i] = "Contemptor Dreadnought"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + nobuy[i]=1 + i += 1; + nobuy[i]=1; + item[i] = "Twin-linked Volkite Culverins"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i]=1; + item[i] = "Contemptor CCW"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i]=1; + var mc = 0; repeat(i) { mc++; diff --git a/objects/obj_turn_end/Draw_0.gml b/objects/obj_turn_end/Draw_0.gml index 4163584fe1..17a7fc0f1d 100644 --- a/objects/obj_turn_end/Draw_0.gml +++ b/objects/obj_turn_end/Draw_0.gml @@ -15,180 +15,9 @@ if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite if (show>0) and (current_battle<=battles){ - var xxx,yyy,i; - xxx=__view_get( e__VW.XView, 0 )+535; - yyy=__view_get( e__VW.YView, 0 )+200; - i=current_battle; - - draw_sprite(spr_purge_panel,0,xxx,yyy); - // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); - // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); - if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174); - if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray); - draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles))); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0); - if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0); - - scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); - // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - - - - if (battle_world[i]<0){ - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Fleets:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allied Fleets:")); - - if (string(strin[1])="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleship ("+string(strin[4])+"% HP)")); - if (string(strin[2])="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigate ("+string(strin[5])+"% HP)")); - if (string(strin[3])="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escort ("+string(strin[6])+"% HP)")); - if (string(strin[1])!="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleships ("+string(strin[4])+"% HP)")); - if (string(strin[2])!="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigates ("+string(strin[5])+"% HP)")); - if (string(strin[3])!="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escorts ("+string(strin[6])+"% HP)")); - - - draw_set_halign(fa_center); - - if (enemy_fleet[1]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[1],xxx+44,yyy+269); - scr_image("ui/force",enemy_fleet[1],xxx+44-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[1]=1) then shw+=string(ecap[1])+" Battleship#"; - if (ecap[1]!=1) then shw+=string(ecap[1])+" Battleships#"; - if (efri[1]=1) then shw+=string(efri[1])+" Frigate#"; - if (efri[1]!=1) then shw+=string(efri[1])+" Frigates#"; - if (eesc[1]=1) then shw+=string(eesc[1])+" Escort#"; - if (eesc[1]!=1) then shw+=string(eesc[1])+" Escorts#"; - - draw_text_transformed(xxx+44,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[2]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[2],xxx+154,yyy+269); - scr_image("ui/force",enemy_fleet[2],xxx+154-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[2]=1) then shw+=string(ecap[2])+" Battleship#"; - if (ecap[2]!=1) then shw+=string(ecap[2])+" Battleships#"; - if (efri[2]=1) then shw+=string(efri[2])+" Frigate#"; - if (efri[2]!=1) then shw+=string(efri[2])+" Frigates#"; - if (eesc[2]=1) then shw+=string(eesc[2])+" Escort#"; - if (eesc[2]!=1) then shw+=string(eesc[2])+" Escorts#"; - - draw_text_transformed(xxx+154,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (enemy_fleet[3]!=0){ - // draw_sprite(spr_force_icon,enemy_fleet[3],xxx+264,yyy+269); - scr_image("ui/force",enemy_fleet[3],xxx+264-32,yyy+269-32,64,64); - var shw;shw=""; - if (ecap[3]=1) then shw+=string(ecap[3])+" Battleship#"; - if (ecap[3]!=1) then shw+=string(ecap[3])+" Battleships#"; - if (efri[3]=1) then shw+=string(efri[3])+" Frigate#"; - if (efri[3]!=1) then shw+=string(efri[3])+" Frigates#"; - if (eesc[3]=1) then shw+=string(eesc[3])+" Escort#"; - if (eesc[3]!=1) then shw+=string(eesc[3])+" Escorts#"; - - draw_text_transformed(xxx+264,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - if (allied_fleet[1]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+374-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[1]=1) then shw+=string(acap[1])+" Battleship#"; - if (acap[1]!=1) then shw+=string(acap[1])+" Battleships#"; - if (afri[1]=1) then shw+=string(afri[1])+" Frigate#"; - if (afri[1]!=1) then shw+=string(afri[1])+" Frigates#"; - if (aesc[1]=1) then shw+=string(aesc[1])+" Escort#"; - if (aesc[1]!=1) then shw+=string(aesc[1])+" Escorts#"; - - draw_text_transformed(xxx+374,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - if (allied_fleet[2]!=0){ - // draw_sprite(spr_force_icon,allied_fleet[1],xxx+484,yyy+269); - scr_image("ui/force",allied_fleet[1],xxx+484-32,yyy+269-32,64,64); - var shw;shw=""; - if (acap[2]=1) then shw+=string(acap[2])+" Battleship#"; - if (acap[2]!=1) then shw+=string(acap[2])+" Battleships#"; - if (afri[2]=1) then shw+=string(afri[2])+" Frigate#"; - if (afri[2]!=1) then shw+=string(afri[2])+" Frigates#"; - if (aesc[2]=1) then shw+=string(aesc[2])+" Escort#"; - if (aesc[2]!=1) then shw+=string(aesc[2])+" Escorts#"; - - draw_text_transformed(xxx+484,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - } - - - - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Retreat"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Fight"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - } - + - if (battle_world[i]>=1){ - if (battle_opponent[i]<=20){ - draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Marines")); - draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Vehicles")); - if (strin[3]!="") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Fortified"));// Not / Barely / Lightly / Moderately / Highly / Maximally - } - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_left); - - draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Factions:")); - draw_text(xxx+332,yyy+237,string_hash_to_newline("Allies:")); - - - - draw_set_halign(fa_center); - // draw_sprite(spr_force_icon,battle_opponent[i],xxx+44,yyy+289); - scr_image("ui/force",battle_opponent[i],xxx+44-32,yyy+289-32,64,64); - draw_text_transformed(xxx+44,yyy+316,string_hash_to_newline(string(strin[4])),0.75,1,0); - draw_set_halign(fa_center);draw_set_font(fnt_40k_14b); - - - draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Offensive"),1.1,1.1,0); - if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1); - } - - draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0); - draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Defensive"),1.1,1.1,0); - if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){ - draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1); - } - - - - - - } + } diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 6748fd8ad7..2a64a85a03 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -33,5 +33,43 @@ if (alerts>0) and (popups_end=1){ } } -draw_set_alpha(1); +main_slate.inside_method = function(){ + if (show>0 && current_battle<=battles && current_battle>-1){ + var xxx=main_slate.XX; + var yyy=main_slate.YY; + var i=current_battle; + + // if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54); + // if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54); + var _img = battle_world[i]==-50; + scr_image("attacked",_img,xxx+12,yyy+54,254,174); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_text(xxx+8,yyy+13,$"{i}/{battles}"); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})",0.7,0.7,0); + if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)",0.7,0.7,0); + + scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64); + // draw_sprite(spr_force_icon,1,xxx+378,yyy+86); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + if (battle_world[current_battle]<0){ + draw_player_fleet_combat_options(); + } else if (battle_world[i]>=1){ + draw_player_ground_combat_options(); + } + } + draw_set_alpha(1); +} + +if (show>0 && current_battle<=battles && current_battle>-1 ){ + main_slate.draw_with_dimensions(535, 200, 530, 400); +} diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 1c108d09fd..61243fd919 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -134,269 +134,299 @@ function ComplexSet(_unit) constructor { right_arm_data = []; - static assign_modulars = function(modulars = global.modular_drawing_items, position = false) { - var _mod = {}; - var _sub_comps = false - - try { - for (var i = 0; i < array_length(modulars); i++) { - _are_exceptions = false; - _mod = modulars[i]; - exceptions = []; - _sub_comps = "none"; + static base_modulars_checks = function(mod_item){ + _are_exceptions = false; + var _mod = mod_item; + exceptions = []; - if (array_contains(blocked, _mod.position)) { - continue; - } + if (array_contains(blocked, _mod.position)) { + return false; + } - if (struct_exists(_mod, "allow_either")) { - _are_exceptions = true; - exceptions = []; - for (var m = 0; m < array_length(_mod.allow_either); m++) { - array_push(exceptions, _mod.allow_either[m]); + if (struct_exists(_mod, "allow_either")) { + _are_exceptions = true; + exceptions = []; + for (var m = 0; m < array_length(_mod.allow_either); m++) { + array_push(exceptions, _mod.allow_either[m]); + } + } + if (struct_exists(_mod, "max_saturation")) { + var _max_sat = _mod.max_saturation; + } + if (struct_exists(_mod, "exp")) { + var _exp_data = _mod.exp; + var _min = 0; + if (struct_exists(_exp_data, "min")) { + _min = _exp_data.min; + if (unit.experience < _exp_data.min) { + if (!check_exception("min_exp")) { + return false; } } - if (struct_exists(_mod, "max_saturation")) { - var _max_sat = _mod.max_saturation; + } + if (struct_exists(_exp_data, "scale")) { + var _m_exp = _exp_data.exp_scale_max; + var _increment_count = _mod.max_saturation / 5; + var _increments = (_m_exp - _min) / _increment_count; + var _sat_roof = _mod.max_saturation; + var _mar_exp = unit.experience; + + if (_mar_exp >= _m_exp) { + spawn_chance = _mod.max_saturation; + } else { + var calc_exp = _mar_exp - _min; + var _inc_point = floor(_mar_exp / _increments); + _max_sat = _inc_point * 5; } - if (struct_exists(_mod, "exp")) { - var _exp_data = _mod.exp; - var _min = 0; - if (struct_exists(_exp_data, "min")) { - _min = _exp_data.min; - if (unit.experience < _exp_data.min) { - if (!check_exception("min_exp")) { - continue; - } - } - } - if (struct_exists(_exp_data, "scale")) { - var _m_exp = _exp_data.exp_scale_max; - var _increment_count = _mod.max_saturation / 5; - var _increments = (_m_exp - _min) / _increment_count; - var _sat_roof = _mod.max_saturation; - var _mar_exp = unit.experience; - - if (_mar_exp >= _m_exp) { - spawn_chance = _mod.max_saturation; - } else { - var calc_exp = _mar_exp - _min; - var _inc_point = floor(_mar_exp / _increments); - _max_sat = _inc_point * 5; - } + } + } + if (struct_exists(_mod, "max_saturation")) { + if (struct_exists(variation_map, _mod.position)) { + if (variation_map[$ _mod.position] >= _max_sat) { + if (!check_exception("max_saturation")) { + return false; } } - if (struct_exists(_mod, "max_saturation")) { - if (struct_exists(variation_map, _mod.position)) { - if (variation_map[$ _mod.position] >= _max_sat) { - if (!check_exception("max_saturation")) { - continue; - } - } - } + } + } + if (!struct_exists(_mod, "body_types")) { + _mod.body_types = [0, 1, 2]; + } + + if (!array_contains(_mod.body_types, armour_type)) { + if (!check_exception("body_types")) { + return false; + } + } + + if (struct_exists(_mod, "role_type")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.role_type); a++) { + var _r_t = _mod.role_type[a]; + _viable = unit.IsSpecialist(_r_t); + if (_viable) { + break; } - if (!struct_exists(_mod, "body_types")) { - _mod.body_types = [0, 1, 2]; + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + return false; } - - if (!array_contains(_mod.body_types, armour_type)) { - if (!check_exception("body_types")) { - continue; - } + if (!check_exception("chapter_disadv")) { + return false; } - - if (struct_exists(_mod, "role_type")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.role_type); a++) { - var _r_t = _mod.role_type[a]; - _viable = unit.IsSpecialist(_r_t); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - continue; - } - if (!check_exception("chapter_disadv")) { - continue; - } - } + } + } + if (struct_exists(_mod, "roles")) { + if (!array_contains(_mod.roles, unit.role())) { + if (!check_exception("roles")) { + return false; } - if (struct_exists(_mod, "roles")) { - if (!array_contains(_mod.roles, unit.role())) { - if (!check_exception("roles")) { - continue; - } - } + } + } + if (struct_exists(_mod, "cultures")) { + if (!scr_has_style(_mod.cultures)) { + if (!check_exception("cultures")) { + return false; } - if (struct_exists(_mod, "cultures")) { - if (!scr_has_style(_mod.cultures)) { - if (!check_exception("cultures")) { - continue; - } - } + } + } + if (struct_exists(_mod, "company")) { + if (!array_contains(_mod.company, unit.company)) { + if (!check_exception("company")) { + return false; } - if (struct_exists(_mod, "company")) { - if (!array_contains(_mod.company, unit.company)) { - if (!check_exception("company")) { - continue; - } - } + } + } + if (struct_exists(_mod, "armours")) { + if (!array_contains(_mod.armours, unit_armour)) { + if (!check_exception("armours")) { + return false; } - if (struct_exists(_mod, "armours")) { - if (!array_contains(_mod.armours, unit_armour)) { - if (!check_exception("armours")) { - continue; - } - } + } + } + if (struct_exists(_mod, "armours_exclude")) { + if (array_contains(_mod.armours_exclude, unit_armour)) { + if (!check_exception("armours_exclude")) { + return false; } - if (struct_exists(_mod, "armours_exclude")) { - if (array_contains(_mod.armours_exclude, unit_armour)) { - if (!check_exception("armours_exclude")) { - continue; - } - } + } + } + if (struct_exists(_mod, "chapter_adv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_adv); a++) { + var _adv = _mod.chapter_adv[a]; + _viable = scr_has_adv(_adv); + if (_viable) { + break; } - if (struct_exists(_mod, "chapter_adv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_adv); a++) { - var _adv = _mod.chapter_adv[a]; - _viable = scr_has_adv(_adv); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + return false; } - if (struct_exists(_mod, "chapter_disadv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { - var _disadv = _mod.chapter_disadv[a]; - _viable = scr_has_disadv(_disadv); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_disadv")) { - continue; - } - } + } + } + if (struct_exists(_mod, "chapter_disadv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { + var _disadv = _mod.chapter_disadv[a]; + _viable = scr_has_disadv(_disadv); + if (_viable) { + break; } - if (struct_exists(_mod, "stats")) { - if (!stat_valuator(_mod.stats, unit)) { - if (!check_exception("stats")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("chapter_disadv")) { + return false; } - if (struct_exists(_mod, "equipped")) { - if (!unit.has_equipped(_mod.equipped)) { - if (!check_exception("equipped")) { - continue; - } - } + } + } + if (struct_exists(_mod, "stats")) { + if (!stat_valuator(_mod.stats, unit)) { + if (!check_exception("stats")) { + return false; + } + } + } + if (struct_exists(_mod, "equipped")) { + if (!unit.has_equipped(_mod.equipped)) { + if (!check_exception("equipped")) { + return false; } + } + } - if (struct_exists(_mod, "traits")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.traits); a++) { - var _trait = _mod.traits[a]; - _viable = unit.has_trait(_trait); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("traits")) { - continue; - } - } + if (struct_exists(_mod, "traits")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.traits); a++) { + var _trait = _mod.traits[a]; + _viable = unit.has_trait(_trait); + if (_viable) { + break; } - if (struct_exists(_mod, "chapter")) { - var chap_name = instance_exists(obj_creation) ? obj_creation.chapter_name : global.chapter_name; - if (chap_name != _mod.chapter) { - if (!check_exception("chapter")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("traits")) { + return false; + } + } + } + if (struct_exists(_mod, "chapter")) { + var chap_name = instance_exists(obj_creation) ? obj_creation.chapter_name : global.chapter_name; + if (chap_name != _mod.chapter) { + if (!check_exception("chapter")) { + return false; } + } + } - var _overides = "none"; - if (struct_exists(_mod, "overides")) { - _overides = _mod.overides; + _overides = "none"; + if (struct_exists(_mod, "overides")) { + _overides = {overides:_mod.overides}; + } + if (struct_exists(_mod, "offsets")){ + var _x = 0; + var _y = 0; + if (struct_exists(_mod.offsets,unit_armour)){ + var _offset = _mod.offsets[$ unit_armour]; + if (struct_exists(_offset,"x")){ + _x += _offset.x; } + if (struct_exists(_offset,"y")){ + _x += _offset.y; + } + } + if (_x != 0 || _y !=0){ + if (_overides == "none"){ + _overides = {offsets:[_x, _y]}; + } else { + _overides.offsets = [_x, _y] + } + } + } + + if (struct_exists(_mod, "subcomponents")){ + _sub_comps = _mod.subcomponents; + } - if (struct_exists(_mod, "subcomponents")){ - _sub_comps = _mod.subcomponents; + if (struct_exists(_mod, "body_parts")){ + var _viable = true; + var _body_areas = struct_get_names(_mod.body_parts); + for (var b=0;b= _status_level) { + var variation_tier = (_unit_tier - _status_level) + 1; + if (variation_map[$ _area] % variation_tier != 0) { + return false; + } + } + } - var _unit_tier = 8; - if (_unit_tier == 8) { - for (var t = 0; t < array_length(tiers); t++) { - var tier = tiers[t]; - if (array_contains(tier, unit.role())) { - _unit_tier = t; - } - } - } - if (_unit_tier >= _status_level) { - var variation_tier = (_unit_tier - _status_level) + 1; - if (variation_map[$ _area] % variation_tier != 0) { - continue; - } - } - } + return true; + } + static assign_modulars = function(modulars = global.modular_drawing_items, position = false) { + var _mod = {}; + + try { + for (var i = 0; i < array_length(modulars); i++) { + _sub_comps = "none"; + _mod = modulars[i]; + var _allowed = base_modulars_checks(_mod); + if (!_allowed){ + continue; + } if (position != false) { if (position == "weapon") { var _weapon_map = _mod.weapon_map; @@ -408,10 +438,10 @@ function ComplexSet(_unit) constructor { } } } else { - add_to_area(_mod.position, _mod.sprite, _overides,_sub_comps); + add_to_area(_mod.position, _mod.sprite, _overides, _sub_comps); } if (struct_exists(_mod, "prevent_others")) { - replace_area(_mod.position, _mod.sprite, _overides,_sub_comps); + replace_area(_mod.position, _mod.sprite, _overides, _sub_comps); array_push(blocked, _mod.position); if (struct_exists(_mod, "ban")) { for (var b = 0; b < array_length(_mod.ban); b++) { @@ -476,6 +506,7 @@ function ComplexSet(_unit) constructor { left_weapon: unit.get_body_data("weapon_variation", "left_arm"), right_weapon: unit.get_body_data("weapon_variation", "right_arm"), necklace : unit.get_body_data("hanging_variant", "throat"), + foreground_item : unit.get_body_data("variant", "throat"), }; static draw_component = function(component_name, texture_draws = {}) { @@ -485,6 +516,10 @@ function ComplexSet(_unit) constructor { if (struct_exists(self, component_name)) { var _sprite = self[$ component_name]; if (sprite_exists(_sprite)) { + + var _draw_x = x_surface_offset; + var _draw_y = y_surface_offset; + var choice = 0; var _map_choice = 3; if (struct_exists(variation_map, component_name)) { @@ -496,9 +531,18 @@ function ComplexSet(_unit) constructor { for (var i = 0; i < array_length(_overide_set); i++) { var _spec_over = _overide_set[i]; if (_spec_over[0] <= choice && _spec_over[1] > choice) { - var _override_areas = struct_get_names(_spec_over[2]); - for (var j = 0; j < array_length(_override_areas); j++) { - replace_area(_override_areas[j], _spec_over[2][$ _override_areas[j]]); + var _override_data = _spec_over[2]; + if (struct_exists(_override_data, "overides")){ + _override_areas = struct_get_names(_override_data.overides); + var _overs = _override_data.overides; + for (var j = 0; j < array_length(_override_areas); j++) { + replace_area(_override_areas[j], _overs[$ _override_areas[j]]); + } + } + if (struct_exists(_override_data, "offsets")){ + var _offsets = _override_data.offsets; + _draw_x += _offsets[0]; + _draw_y += _offsets[1]; } } } @@ -542,20 +586,20 @@ function ComplexSet(_unit) constructor { // show_debug_message($"{_tex_data.areas[t]}"); var _replace_col = shader_get_uniform(armour_texture, "replace_colour"); shader_set_uniform_f_array(_replace_col, _tex_data.areas[t]); - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); + draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); } } surface_reset_target(); surface_set_target(_return_surface); shader_set(full_livery_shader); - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); + draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); draw_surface(base_component_surface, 0, 0); surface_reset_target(); surface_clear_and_free(base_component_surface); surface_set_target(_return_surface); } else { - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); + draw_sprite(_sprite, choice ?? 0, _draw_x, _draw_y); } if (struct_exists(subcomponents, component_name)) { var _subcomponents_found = false; @@ -575,13 +619,13 @@ function ComplexSet(_unit) constructor { //show_debug_message($"subcomponents 2: {_subcomponents}"); var _sub_choice = 0; if (_map_choice != 0){ - _sub_choice = sqr(_map_choice + 1) - i; + _sub_choice = floor(sin(_map_choice) * 100); } var _total_options = -1; for (var s=0;s -1){ if (_total_options == 0){ @@ -596,7 +640,8 @@ function ComplexSet(_unit) constructor { _choice_count = 0; for (var s=0;s= _choice_count && _sub_choice_final < _choice_count+sprite_get_number(_subcomponents[s])){ - draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, x_surface_offset, y_surface_offset); + //show_debug_message($"{_sub_choice_final}, {_choice_count}"); + draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, _draw_x, _draw_y); break; } else { _choice_count += sprite_get_number(_subcomponents[s]); @@ -698,6 +743,18 @@ function ComplexSet(_unit) constructor { }; static draw_weapon_and_hands = function() { + if (armour_type == ArmourType.Dreadnought){ + show_debug_message("dread weapons"); + if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { + draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); + show_debug_message("dread right"); + } + if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite)) { + draw_sprite(weapon_left.sprite, 0, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); + show_debug_message("dread left"); + } + exit; + } // Draw hands bellow the weapon sprite; if (!weapon_right.ui_twoh && !weapon_left.ui_twoh) { for (var i = 0; i <= 1; i++) { @@ -929,7 +986,8 @@ function ComplexSet(_unit) constructor { "left_pauldron_embeleshments", "right_pauldron_hangings", "left_pauldron_hangings", - "left_personal_livery" + "left_personal_livery", + "foreground_item", ]; } else { _draw_order = [ @@ -964,7 +1022,8 @@ function ComplexSet(_unit) constructor { "tabbard", "robe", "belt", - "left_personal_livery" + "left_personal_livery", + "foreground_item", ]; } for (var i = 0; i < array_length(_draw_order); i++) { @@ -1194,6 +1253,13 @@ function ComplexSet(_unit) constructor { }); armour_type = ArmourType.Dreadnought; break; + case "Contemptor Dreadnought": + add_group({ + armour: spr_contemptor_chasis_colors, + head: spr_contemptor_head_colors, + }); + armour_type = ArmourType.Dreadnought; + break; case "Scout Armour": add_group({ armour: spr_scout_complex, @@ -1284,6 +1350,11 @@ function ComplexSet(_unit) constructor { } }; + offsets=[]; + static add_offsets = function(area, _offset_start, sprite_length, overide_data){ + + } + static add_overide = function(area, _overide_start, sprite_length, overide_data) { if (!struct_exists(overides, area)) { overides[$ area] = []; @@ -1295,7 +1366,26 @@ function ComplexSet(_unit) constructor { if (!struct_exists(subcomponents, area)) { subcomponents[$ area] = []; } - array_push(subcomponents[$ area], [_overide_start, _overide_start + sprite_length, sub_components]); + var _accepted_subs = []; + for (var i=0;i0){ if (_loc_heal_points >0){ if (turn_end){ diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 4df8b32416..0656451694 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -323,14 +323,12 @@ global.modular_drawing_items = [ } }, { - cultures : ["Cthonian", "Gothic"], sprite : spr_chap_trim_left, body_types :[0], position : "left_trim", role_type : [SPECIALISTS_CHAPLAINS], }, { - cultures : ["Cthonian", "Gothic"], sprite : spr_chap_trim_right, body_types :[0], position : "right_trim", @@ -575,7 +573,10 @@ global.modular_drawing_items = [ body_types :[0], position : "belt", role_type : [SPECIALISTS_CHAPLAINS], - armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], + cultures : ["Gothic"], + armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour"], + allow_either : ["cultures", "role_type"], + }, { sprite : spr_tech_belt, @@ -1249,7 +1250,55 @@ global.modular_drawing_items = [ [spr_blank, spr_cata_right_trim_2], [spr_blank, spr_cata_right_trim_1], ], - }, + }, + { + position : "foreground_item", + sprite: spr_gear_combat_shield, + body_types: [0,1, 2], + offsets : { + "Terminator Armour" : { + y : -10, + x : -15, + }, + "Tartaros" : { + x : -8, + } + }, + subcomponents :[ + [spr_blank, spr_combat_shield_bottom_part], + ], + equipped : { + "gear" : "Combat Shield", + }, + }, + { + position : "right_eye", + sprite : spr_gear_apoth_eye, + role_type : [SPECIALISTS_APOTHECARIES], + offsets : { + "Terminator Armour":{ + y :-6, + }, + "Tartaros":{ + y :-6, + } + } + + }, + { + position : "backpack_decoration", + sprite : spr_gear_apoth, + role_type : [SPECIALISTS_APOTHECARIES], + offsets : { + "Terminator Armour":{ + y :- 22, + }, + "Tartaros":{ + y :- 30, + } + } + + } ]; @@ -1743,6 +1792,11 @@ base: { }, variants : [{ sprite: spr_weapon_assca, + }, + { + sprite: spr_weapon_assca, + body_types: [3], + armours : ["Dreadnought"], }], }, "Heavy Flamer": { @@ -1773,9 +1827,97 @@ base: { variants: [ { sprite: spr_weapon_lasca, + }, + { + sprite: spr_dread_plasma_cannon, + body_types: [3], + armours : ["Dreadnought"], } ], }, +"Close Combat Weapon" : { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + armours : ["Dreadnought"], + }, + variants: [ + { + sprite: spr_dread_claw, + }, + { + sprite: spr_contemptor_CCW, + armours : ["Contemptor Dreadnought"], + } + ] +}, +"Twin Linked Heavy Bolter" : { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_heavy_bolter, + } + ] +}, +"Dreadnought Lightning Claw": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_claw, + } + ] +}, +"CCW Heavy Flamer": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_claw, + } + ] +}, +"Dreadnought Power Claw": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_claw, + } + ] +}, +"Inferno Cannon": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_plasma_cannon, + } + ] +}, "Multi-Melta" : { base: { body_types: [0, 1], @@ -1786,9 +1928,53 @@ base: { variants: [ { sprite: spr_weapon_mmelta, - } + }, + { + sprite: spr_dread_plasma_cannon, + body_types: [3], + armours : ["Dreadnought"], + } ], }, +"Twin Linked Lascannon": { + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_lascannon, + } + ] +}, +"Heavy Conversion Beam Projector":{ + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_dread_plasma_cannon, + } + ] +}, +"Twin-linked Volkite Culverins":{ + base: { + body_types: [3], + weapon_data: { + display_type: "dreadnought", + }, + }, + variants: [ + { + sprite: spr_twl_Volkite_Culverins, + } + ] +}, "Bolt Pistol": { base: { weapon_data: { @@ -1798,7 +1984,7 @@ base: { }, variants: [{ sprite: spr_weapon_boltpis, - }] + }], }, "Infernus Pistol": { @@ -1988,9 +2174,16 @@ base: { new_weapon_draw: true }, }, - variants: [{ - sprite: spr_weapon_missile, - }] + variants: [ + { + sprite: spr_weapon_missile, + }, + { + sprite: spr_dread_missile, + body_types: [3], + armours : ["Dreadnought"], + } + ] }, "Plasma Cannon": { base: { @@ -2009,6 +2202,11 @@ base: { }, sprite: spr_weapon_plasc, body_types: [0, 1] + }, + { + sprite: spr_dread_plasma_cannon, + body_types: [3], + armours : ["Dreadnought"], } ] }, @@ -2188,6 +2386,11 @@ base: { variants: [ { sprite: spr_weapon_autocannon2 + }, + { + sprite: spr_dread_autocannon, + body_types: [3], + armours : ["Dreadnought"], } ] }, diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index 7134b2d637..058dbf4a31 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -262,9 +262,7 @@ function scr_draw_unit_image(_background = false) { var servo_harness = 0; var halo = 0; var reverent_guardians = false; - var tech_brothers_trait = -5; var body_part; - var dev_trait = 0; static _body_parts = ARR_body_parts; // Chaplain @@ -329,24 +327,24 @@ function scr_draw_unit_image(_background = false) { halo = 1; } - switch (unit_armour) { - case "Scout Armour": - armour_type = ArmourType.Scout; - break; - case "Terminator Armour": - case "Tartaros": - case "Cataphractii": - armour_type = ArmourType.Terminator; - break; - case "Dreadnought": - case "Contemptor Dreadnought": - armour_type = ArmourType.Dreadnought; - break; - case ITEM_NAME_NONE: - case "": - case "None": - armour_type = ArmourType.None; - break; + if (is_dreadnought()){ + armour_type = ArmourType.Dreadnought; + } else { + switch (unit_armour) { + case "Scout Armour": + armour_type = ArmourType.Scout; + break; + case "Terminator Armour": + case "Tartaros": + case "Cataphractii": + armour_type = ArmourType.Terminator; + break; + case ITEM_NAME_NONE: + case "": + case "None": + armour_type = ArmourType.None; + break; + } } draw_backpack = armour_type == ArmourType.Normal; @@ -363,55 +361,6 @@ function scr_draw_unit_image(_background = false) { pauldron_trim = _controller ? obj_controller.trim : obj_creation.trim; //TODO complex shader means no need for all this edge case stuff - - // Dark Angels Deathwing - if (unit_special_colours == UnitSpecialColours.Deathwing) { - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Librarian], _role[eROLE.Techmarine]], unit_role)) { - shader_array_set[ShaderType.Body] = Colors.Deathwing; - shader_array_set[ShaderType.Trim] = Colors.Light_Caliban_Green; - if (unit_role != _role[eROLE.Apothecary]) { - shader_array_set[ShaderType.Helmet] = Colors.Deathwing; - } - } - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Techmarine]], unit_role)) { - shader_array_set[ShaderType.RightPauldron] = Colors.Deathwing; - } - shader_array_set[ShaderType.LeftPauldron] = Colors.Deathwing; - pauldron_trim = 0; - specialist_colours = 0; - } - - // Dark Angels Ravenwing - if (unit_special_colours == UnitSpecialColours.Ravenwing) { - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Librarian], _role[eROLE.Techmarine], _role[eROLE.Apothecary]], unit_role)) { - shader_array_set[ShaderType.Body] = Colors.Black; - shader_array_set[ShaderType.Helmet] = Colors.Black; - } - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Techmarine]], unit_role)) { - shader_array_set[ShaderType.RightPauldron] = Colors.Black; - } - shader_array_set[ShaderType.LeftPauldron] = Colors.Black; - pauldron_trim = 0; - specialist_colours = 0; - } - - // Dark Angels Captains - if (unit_chapter == "Dark Angels" && unit_role == _role[eROLE.Captain] && company != 1) { - shader_array_set[ShaderType.RightPauldron] = Colors.Dark_Red; - shader_array_set[ShaderType.Helmet] = Colors.Deathwing; - pauldron_trim = 0; - specialist_colours = 0; - } - - // Dark Angels Honour Guard - if (unit_chapter == "Dark Angels" && unit_role == _role[eROLE.HonourGuard]) { - shader_array_set[ShaderType.Body] = Colors.Deathwing; - shader_array_set[ShaderType.RightPauldron] = Colors.Deathwing; - shader_array_set[ShaderType.LeftPauldron] = Colors.Deathwing; - shader_array_set[ShaderType.Trim] = Colors.Copper; - pauldron_trim = 0; - specialist_colours = 0; - } //We can return to the custom shader values at any time during draw doing this set_shader_array(shader_array_set); // Marine draw sequence @@ -428,28 +377,8 @@ function scr_draw_unit_image(_background = false) { //Rejoice! // draw_sprite(spr_marine_base,img,x_surface_offset,y_surface_offset); - if (unit_armour != "") { - var yep = 0; - if (scr_has_adv("Devastator Doctrine")) { - dev_trait = 1; - } - if (unit_specialization == UnitSpecialization.Techmarine) { - if (scr_has_adv("Tech-Brothers")) { - tech_brothers_trait = 0; - } - } - } else { - armour_sprite = spr_weapon_blank; - } // Define armour - // Draw the lights - if ((unit_specialization == UnitSpecialization.Apothecary) && (unit_armour != "") && (back_equipment == BackType.None)) { - if (unit_armour == "Terminator Armour") { - draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 22); // for terminators - } else { - draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 6); - } // for normal power armour - } + armour_sprite = spr_weapon_blank; // Draw Techmarine gear if ((servo_arm > 0 || servo_harness > 0) && (!arm_bypass)) { @@ -521,11 +450,10 @@ function scr_draw_unit_image(_background = false) { if (body.torso.robes == 0) { complex_set.add_to_area("robe", spr_marine_robes); } else if (body.torso.robes == 1) { - if (scr_has_disadv("Warp Tainted") && !modest_livery) { + if (scr_has_disadv("Warp Tainted")) { complex_set.add_to_area("robes", spr_binders_robes); - } else { - complex_set.add_to_area("robes", spr_marine_robes); } + complex_set.add_to_area("robes", spr_marine_robes); } else { complex_set.add_to_area("tabbard", spr_cloth_tabbard); } @@ -550,22 +478,8 @@ function scr_draw_unit_image(_background = false) { draw_sprite(armour_draw[0], armour_draw[1], x_surface_offset, y_surface_offset); } - // Draw decals, features and other stuff - if ((dev_trait >= 10) && (!modest_livery)) { - draw_sprite(armour_sprite, dev_trait, x_surface_offset, y_surface_offset); - } // Devastator Doctrine battle damage - // if (tech_brothers_trait>=0) and (modest_livery=0) then draw_sprite(spr_gear_techb,tech_brothers_trait,x_surface_offset,y_surface_offset);// Tech-Brothers bling - //sgt helms - // Apothecary Details if (unit_specialization == UnitSpecialization.Apothecary) { - if (unit_armour == "Tartaros") { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); // was y_draw-4 with old tartar - } else if (unit_armour == "Terminator Armour") { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); - } else { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset); - } if (gear() == "Narthecium") { if (armour_type == ArmourType.Normal) { draw_sprite(spr_narthecium_2, 0, x_surface_offset + 66, y_surface_offset + 5); @@ -575,49 +489,15 @@ function scr_draw_unit_image(_background = false) { } } } - - // Draw Custom Helmets - if (armour_type == ArmourType.Normal && !armour_bypass) { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); - } - if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { - draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); - } - } else if (unit_armour == "Terminator Armour" && !armour_bypass) { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); - } - if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { - draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); - } - } - - var shield_offset_x = 0; - var shield_offset_y = 0; - if (unit_armour == "Terminator Armour") { - shield_offset_x = -15; - shield_offset_y = -10; - } else if (unit_armour == "Tartaros") { - shield_offset_x = -8; - } - if (gear() == "Combat Shield") { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_gear_combat_shield, 1, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); - } else { - draw_sprite(spr_gear_combat_shield, 0, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); - } - } - // if (reverent_guardians=1) then draw_sprite(spr_pack_brazier,1,x_surface_offset,y_surface_offset); - if (armour_type == ArmourType.Dreadnought) { + /*if (armour_type == ArmourType.Dreadnought) { var left_arm = dreadnought_sprite_components(weapon_two()); var colour_scheme = specialist_colours <= 1 ? 0 : 1; draw_sprite(left_arm, colour_scheme, x_surface_offset, y_surface_offset); colour_scheme += 2; var right_arm = dreadnought_sprite_components(weapon_one()); draw_sprite(right_arm, colour_scheme, x_surface_offset, y_surface_offset); - } + }* /*}else{ draw_set_color(c_gray); draw_text(0,0,string_hash_to_newline("Color swap shader#did not compile")); diff --git a/scripts/scr_get_item_names/scr_get_item_names.gml b/scripts/scr_get_item_names/scr_get_item_names.gml index da0793e12f..b321731631 100644 --- a/scripts/scr_get_item_names/scr_get_item_names.gml +++ b/scripts/scr_get_item_names/scr_get_item_names.gml @@ -150,7 +150,7 @@ function push_marine_mobility_item_names(_item_names) { /// @param {array} _item_names - The list to append to. /// @returns {void} function push_dreadnought_ranged_weapons_item_names(_item_names) { - var item_count = 10; + var item_count = 11; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -164,7 +164,8 @@ function push_dreadnought_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Twin Linked Lascannon"; _item_names[@ index++] = "Twin Linked Assault Cannon Mount"; _item_names[@ index++] = "Twin Linked Heavy Bolter"; - _item_names[@ index++] = "Heavy Conversion Beam Projector"; // 10 + _item_names[@ index++] = "Heavy Conversion Beam Projector"; + _item_names[@ index++] = "Twin-linked Volkite Culverins";// 10 } /// @description This function appends the list of dreadnought melee weapons to the given list. diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 624301a718..e38b38a20e 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1245,6 +1245,7 @@ function scr_initialize_custom() { devastator = devastator + real(s_val); break; case "dreadnought": + case "Contemptor Dreadnought": dreadnought = dreadnought + real(s_val); break; } diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index 5d81409d9b..cc5dece659 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -2341,8 +2341,18 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } }; + static is_dreadnought = function(){ + _arm_data = get_armour_data(); + if (is_struct(_arm_data)){ + if (_arm_data.has_tag("dreadnought")){ + return true + } + } + return false; + } + /// @param {Enum.EquipmentSlot} _slot - add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { + static add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { var _slots = array_create(0); switch (_slot) { diff --git a/scripts/scr_reequip_units/scr_reequip_units.gml b/scripts/scr_reequip_units/scr_reequip_units.gml index 148891e25c..04ac7e9e15 100644 --- a/scripts/scr_reequip_units/scr_reequip_units.gml +++ b/scripts/scr_reequip_units/scr_reequip_units.gml @@ -17,13 +17,9 @@ function set_up_equip_popup(){ if (vih==0){ if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - var _arm_data = _unit.get_armour_data(); - vih=1; - if (is_struct(_arm_data)){ - if (_arm_data.has_tag("dreadnought")){ - vih=6; - _unchangeable_armour = true; - } + vih = _unit.is_dreadnought() ? 6 : 1; + if (vih == 6){ + _unchangeable_armour = true; } } else if (man[f]=="vehicle"){ if (ma_role[f]=="Land Raider") { vih=50;} @@ -40,12 +36,13 @@ function set_up_equip_popup(){ break; } else if (man[f]=="man" && is_struct(display_unit[f])){ _unit=display_unit[f]; - if (_unit.armour()=="Dreadnought" && vih==1){ - allow=false; - break; - } else if (_unit.armour()!="Dreadnought" && vih==6){ + var _is_dread = _unit.is_dreadnought(); + if (_is_dread && vih==1){ + allow=false; + break; + } else if (!_is_dread && vih == 6){ allow=false; - break; + break; } } } else if (vih>=50){ @@ -636,7 +633,7 @@ function draw_popup_equip(){ warning = "Not enough " + string(n_gear) + "; " + string(units - req_gear_num) + " more are required."; } - if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0)) { + if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0) && (string_count("Contemptor Dreadnought", n_armour) > 0)) { n_good4 = 0; warning = "Dreadnoughts may not use infantry equipment."; } @@ -669,7 +666,7 @@ function draw_popup_equip(){ warning = "Cannot use this gear with Terminator Armour."; } - if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought")) { + if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought") && (n_armour == "Contemptor Dreadnought")) { n_good5 = 0; warning = string(obj_ini.role[100][6]) + "s may not use mobility gear."; } diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index 68be5a41cf..84c57c64eb 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -278,12 +278,9 @@ function Roster() constructor{ } } else { if (!array_contains(_squads, "dreadnought")){ - var _armour_data = _unit.get_armour_data(); - if (is_struct(_armour_data)){ - if (_armour_data.has_tag("dreadnought")){ - array_push(_squads, "dreadnought"); - new_squad_button("Dreadnought", "dreadnought"); - } + if (_unit.is_dreadnought()){ + array_push(_squads, "dreadnought"); + new_squad_button("Dreadnought", "dreadnought"); } } } diff --git a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml index 250a1b7736..6e55042f90 100644 --- a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml +++ b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml @@ -189,6 +189,9 @@ function dreadnought_sprite_components(component){ "Multi-Melta": spr_dread_plasma_cannon, "Twin Linked Lascannon": spr_dread_lascannon, "Heavy Conversion Beam Projector": spr_dread_plasma_cannon, + "Twin-linked Volkite Culverins":spr_twl_Volkite_Culverins, + "Contemptor CCW":spr_contemptor_CCW, + }; if (struct_exists(components, component)){ return components[$ component] diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index 75d466af9a..e86c4e1648 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -380,7 +380,7 @@ function scr_ui_settings() { draw_rectangle(x5, y5, x5 - string_width(title), y5 + string_height(title) - 2, 0); var nep = false; - + if (((obj_ini.armour[co, ide] == "Terminator Armour") || (obj_ini.armour[co, ide] == "Dreadnought")) && (gg == 4)) { nep = true; } diff --git a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml index 23386f8a3d..a49a67206a 100644 --- a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml +++ b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml @@ -110,7 +110,7 @@ function scr_update_unit_armour(new_armour, from_armoury = true, to_armoury = tr } } - if (armour() == "Dreadnought") { + if (new_arm_data.has_tag("dreadnought")) { is_boarder = false; update_gear(""); update_mobility_item(""); diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 2c7e1ebaf7..33479c14af 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -65,6 +65,22 @@ global.weapons = { "arp": 0, "tags": ["Volkite", "energy", "pistol"] }, + "Twin-linked Volkite Culverins":{ + "abbreviation": "T-LVolkCulv", + "attack": { + "standard": 250, + "master_crafted": 270, + "artifact": 290 + }, + "description": "The pistol variant of the long-lost Volkite weapon type, the Serpenta was a mainstay of Moritats and often wielded by Centurions of the Legiones Astartes. Now a symbol of status to match its fearsome potency, a sighting of this ancient weapon would send many foes running.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 10, + "range": 3, + "spli": 4, + "arp": 0, + "tags": ["Volkite", "energy", "dreadnought"] + }, //Bolt Pack "Phobos Bolt Pistol": { "abbreviation": "PhBltPis", @@ -715,6 +731,28 @@ global.weapons = { "maintenance" : 0.1, "tags": ["power", "vehicle", "dual", "dreadnought", "fist"], }, + "Contemptor CCW": { + "abbreviation": "ConCCW", + "attack": { + "standard": 300, + "master_crafted": 400, + "artifact": 600 + }, + "melee_mod": { + "standard": 1.2, + "master_crafted": 1.2, + "artifact": 1.2 + }, + "description": "A specialized Lightning Claw variant designed for Dreadnoughts, these claws are capable of ripping through enemy vehicles and infantry with ease.", + "melee_hands": 5, + "ranged_hands": 0, + "ammo": 0, + "range": 1, + "spli": 15, + "arp": 1, + "maintenance" : 0.1, + "tags": ["power", "dual", "dreadnought", "fist"], + }, "Thunder Hammer": { "abbreviation": "ThndHmr", "attack": { @@ -2276,6 +2314,29 @@ global.gear = { "tags": ["dreadnought"], "maintenance" : 1, }, + "Contemptor Dreadnought": { + "abbreviation": "Drdnght", + "armour_value": { + "standard": 50, + "master_crafted": 55, + "artifact": 60 + }, + "ranged_mod": { + "standard": 0, + "master_crafted": 5, // Augmented + "artifact": 10 // Augmented + }, + "melee_mod": { + "standard": 0, + "master_crafted": 5, // Augmented + "artifact": 10 // Augmented + }, + "melee_hands": 8, + "ranged_hands": 8, + "description": "PLACEHOLDER", + "tags": ["dreadnought"], + "maintenance" : 1, + }, "Tartaros": { "abbreviation": "Tartrs", "armour_value": { diff --git a/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png b/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png new file mode 100644 index 0000000000000000000000000000000000000000..8d5f84a1a4e0290ded996aeac308be4496fc8005 GIT binary patch literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrsxTlL_NX4zUw;YQW z8wfBsRBHR5US4!EQUB+af4zGhyv}%?deGwPw`+BbsKKF0=@OiCK#mw_kdSryS5?aW zM4tQC);}rqu9zC+Rr&kx@+rr8-);I|=(v84((Chan>cs$6+e6RKUs$N zkbUPi*1u1`TKfIn{r%c`tL$I>&tv(%yxx4DQ{8jD<>Jz{Go$9`zP@yC*Vaj%J?~gI z&HcVuEAo4#H2Y`EAk|rp_nCIHT81sX_ifwyLgh_gSB9oecln(t|0+eM$NlS^0~1eG zN{24heXv(+%F2MRbL&^1O1sv(m^p$#?m4muD5fx0re0KUY*uft}ZZu-SM2#XX8MG4m@b zWqAMB@^j!nZcs7>fd?k_j2%IqlAHM4-GE%x64!{5l*E!$tK_0oAjM#0U}UOmV4-VZ z5@Kj#Wnyk+VxetdU}a#SG&y-2iiX_$l+3hB+!}(<-3D2z0k@$fGdH!kBr&%Dw;q<; SzpeuHFnGH9xvX2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%o2QFoNX4zUckJ^X zTZphfFz>c?ZD2VO_>4z$*=?&>J%J?#HH{_fmd`$vK4US<38re^T;VEHshf(ahD$cz zXP4-EXus$~UEPutMM0qX0|E~8%zm4DCnrDszuf&|%YPZR4W>ZeeJ`nlYZ_> z+<)7}<;dN?!6$!r#pJGkJpcH9{_n?^n5OtGkJ)fdrk-*28}-UA{*HT2QMFzDKk{eI zzvq6&|Ka+6{r2dpn2a0m%`)XP-<&^ly>{pBdaIK2A{V4$zwBK%v!{7FlhwOHMirLjsmxuHbqhwQ$YO625|3bKA>3tlR>dY1qCanDEYH1;t5^h=v2PwOi+N;~+*#ZR%z>U_xICjQ@d)BdPh z?&NQ}IsbcC;FZe0Ovww&+xMrhrwT;F6GND3g?~DB-pI!^s;ho0Xr7 zBwwu3Tjb>--k)lu_VA6zJI0G^mL__<|NZOj!#Uj5?Ju8y+&Sl}<#nE;DY;cSIiXA| zv%jsJUEp`NWvf@a$eB9R$l`BK2EVttC9W#F5XG{&{;rH}y~uMD{o}V-Us)~L^)z*5 znUT$+^%J?)FK#IZ0z{phBz(Uu+ zB*f6f%EZFT*i_rVz{NoH S4xMZSxzp3t&t;ucLK6UczP)__ literal 0 HcmV?d00001 diff --git a/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png new file mode 100644 index 0000000000000000000000000000000000000000..8d5f84a1a4e0290ded996aeac308be4496fc8005 GIT binary patch literal 868 zcmeAS@N?(olHy`uVBq!ia0vp^%Ypa>2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6MrsxTlL_NX4zUw;YQW z8wfBsRBHR5US4!EQUB+af4zGhyv}%?deGwPw`+BbsKKF0=@OiCK#mw_kdSryS5?aW zM4tQC);}rqu9zC+Rr&kx@+rr8-);I|=(v84((Chan>cs$6+e6RKUs$N zkbUPi*1u1`TKfIn{r%c`tL$I>&tv(%yxx4DQ{8jD<>Jz{Go$9`zP@yC*Vaj%J?~gI z&HcVuEAo4#H2Y`EAk|rp_nCIHT81sX_ifwyLgh_gSB9oecln(t|0+eM$NlS^0~1eG zN{24heXv(+%F2MRbL&^1O1sv(m^p$#?m4muD5fx0re0KUY*uft}ZZu-SM2#XX8MG4m@b zWqAMB@^j!nZcs7>fd?k_j2%IqlAHM4-GE%x64!{5l*E!$tK_0oAjM#0U}UOmV4-VZ z5@Kj#Wnyk+VxetdU}a#SG&y-2iiX_$l+3hB+!}(<-3D2z0k@$fGdH!kBr&%Dw;q<; SzpeuHFnGH9xvX2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#G6Ms%o2QFoNX4zUckJ^X zTZphfFz>c?ZD2VO_>4z$*=?&>J%J?#HH{_fmd`$vK4US<38re^T;VEHshf(ahD$cz zXP4-EXus$~UEPutMM0qX0|E~8%zm4DCnrDszuf&|%YPZR4W>ZeeJ`nlYZ_> z+<)7}<;dN?!6$!r#pJGkJpcH9{_n?^n5OtGkJ)fdrk-*28}-UA{*HT2QMFzDKk{eI zzvq6&|Ka+6{r2dpn2a0m%`)XP-<&^ly>{pBdaIK2A{V4$zwBK%v!{7FlhwOHMirLjsmxuHbqhwQ$YO625|3bKA>3tlR>dY1qCanDEYH1;t5^h=v2PwOi+N;~+*#ZR%z>U_xICjQ@d)BdPh z?&NQ}IsbcC;FZe0Ovww&+xMrhrwT;F6GND3g?~DB-pI!^s;ho0Xr7 zBwwu3Tjb>--k)lu_VA6zJI0G^mL__<|NZOj!#Uj5?Ju8y+&Sl}<#nE;DY;cSIiXA| zv%jsJUEp`NWvf@a$eB9R$l`BK2EVttC9W#F5XG{&{;rH}y~uMD{o}V-Us)~L^)z*5 znUT$+^%J?)FK#IZ0z{phBz(Uu+ zB*f6f%EZFT*i_rVz{NoH S4xMZSxzp3t&t;ucLK6UczP)__ literal 0 HcmV?d00001 diff --git a/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy b/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy new file mode 100644 index 0000000000..06b31e8c60 --- /dev/null +++ b/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_combat_shield_bottom_part", + "bboxMode":0, + "bbox_bottom":220, + "bbox_left":7, + "bbox_right":72, + "bbox_top":189, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","blendMode":0,"displayName":"default","isLocked":false,"name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_combat_shield_bottom_part", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_combat_shield_bottom_part", + "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":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_combat_shield_bottom_part", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"0ca30034-8ae6-44ea-ab2a-6277d1920908","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6a05f034-da34-4cbc-9334-b13b05307598","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.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":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png b/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png new file mode 100644 index 0000000000000000000000000000000000000000..d0f4a7d1051064ae533a15fc4d3246f712efee5c GIT binary patch literal 3246 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_CCW", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e2b8255-80d9-44fb-90a8-fd804243ca38","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png b/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png new file mode 100644 index 0000000000000000000000000000000000000000..0dbe722fa36abc24af4620e2082e9d4bc3748abe GIT binary patch literal 10643 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 A-2eap literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png b/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png new file mode 100644 index 0000000000000000000000000000000000000000..0dbe722fa36abc24af4620e2082e9d4bc3748abe GIT binary patch literal 10643 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 A-2eap literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy b/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy new file mode 100644 index 0000000000..77b1b3efe9 --- /dev/null +++ b/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_chasis_colors", + "bboxMode":0, + "bbox_bottom":249, + "bbox_left":72, + "bbox_right":243, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d55f9e41-41e0-43bd-b40c-86d963212769","name":"d55f9e41-41e0-43bd-b40c-86d963212769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c511d01c-c558-46fa-b06f-82950d47dfc4","blendMode":0,"displayName":"default","isLocked":false,"name":"c511d01c-c558-46fa-b06f-82950d47dfc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_chasis_colors", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_contemptor_chasis_colors", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_chasis_colors", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"d55f9e41-41e0-43bd-b40c-86d963212769","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84faeb3a-e305-44d2-80c7-0e9bacc81e82","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png b/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png new file mode 100644 index 0000000000000000000000000000000000000000..1adb1412918757424e86830a0c8f0f051a9f0852 GIT binary patch literal 1083 zcmeAS@N?(olHy`uVBq!ia0y~yU^D`14Ba#P!1^6 z@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2Y)RhkE)4%caKYZ?lNlJ8^*mi1Ln>~)z2lpA zIY5H-!s{(s1`V3RGtwn*dR}`VdL`1U{mr7?3eGIb%M2V84)Dk<_xl`t*`g?Fu5e`8 zlkYd{CYApF^h$*hXgGfG;H2iUeGK#VDxJJPFIV03)kggp%byp$;eK#)m&d2wH`nBE zE7vcZ5|aBMR_&*88GD6Q&k2jx)hhPo>=D_83--)XublYg`VHBKnF1+1FLEc=tet#? z-6`kZnrn{RmdBd<2bJ`3R&yG)ZPP#UYj8hrk;gwW}km0oW#G?H2j!j+gqNcvb|q<*17IaJ886XS>gJk20=;Z9T98o zpV|wpYImK)|NR_e^q;B89P207WShOtn-Ke6-*QIz+_|CEJ?5VK`tJswo2-z`Q9bXT zy+~HH<2LO*yKKJl&pC2hMf3D0BTw7aulhY-ebv6Zbls#~`=VF93(DQ{_DcBXXERn8 zuQ|_YFy;G8mJ4AMu6}o3E1mY;DaYSeI%V$DyEo=O`!nOsbBXzk4qNL*@tva<_7whmy2FsUAei8FK6RC{?{z`wGK=Q z?KtSnBDvhacaqtKsO_PKZ(Aa73A|>x?q>T%^@PRJUWZwsUq9)ck-FR8{~2OC7#SFu>Ka(+8kmL{npl}wTA3JV8yHv_7%aTo z^BF}$ZhlH;S|x4`7aC0bff_X6Hk4%MrWThZ<`&@A(>_&n0w~BmUHx3vIVCg!0OU1a AQvd(} literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png b/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png new file mode 100644 index 0000000000000000000000000000000000000000..1adb1412918757424e86830a0c8f0f051a9f0852 GIT binary patch literal 1083 zcmeAS@N?(olHy`uVBq!ia0y~yU^D`14Ba#P!1^6 z@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2Y)RhkE)4%caKYZ?lNlJ8^*mi1Ln>~)z2lpA zIY5H-!s{(s1`V3RGtwn*dR}`VdL`1U{mr7?3eGIb%M2V84)Dk<_xl`t*`g?Fu5e`8 zlkYd{CYApF^h$*hXgGfG;H2iUeGK#VDxJJPFIV03)kggp%byp$;eK#)m&d2wH`nBE zE7vcZ5|aBMR_&*88GD6Q&k2jx)hhPo>=D_83--)XublYg`VHBKnF1+1FLEc=tet#? z-6`kZnrn{RmdBd<2bJ`3R&yG)ZPP#UYj8hrk;gwW}km0oW#G?H2j!j+gqNcvb|q<*17IaJ886XS>gJk20=;Z9T98o zpV|wpYImK)|NR_e^q;B89P207WShOtn-Ke6-*QIz+_|CEJ?5VK`tJswo2-z`Q9bXT zy+~HH<2LO*yKKJl&pC2hMf3D0BTw7aulhY-ebv6Zbls#~`=VF93(DQ{_DcBXXERn8 zuQ|_YFy;G8mJ4AMu6}o3E1mY;DaYSeI%V$DyEo=O`!nOsbBXzk4qNL*@tva<_7whmy2FsUAei8FK6RC{?{z`wGK=Q z?KtSnBDvhacaqtKsO_PKZ(Aa73A|>x?q>T%^@PRJUWZwsUq9)ck-FR8{~2OC7#SFu>Ka(+8kmL{npl}wTA3JV8yHv_7%aTo z^BF}$ZhlH;S|x4`7aC0bff_X6Hk4%MrWThZ<`&@A(>_&n0w~BmUHx3vIVCg!0OU1a AQvd(} literal 0 HcmV?d00001 diff --git a/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy b/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy new file mode 100644 index 0000000000..c2ae9398f7 --- /dev/null +++ b/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_head_colors", + "bboxMode":0, + "bbox_bottom":47, + "bbox_left":143, + "bbox_right":172, + "bbox_top":29, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"74c01830-4218-44ae-aa3d-aba9109cecc2","name":"74c01830-4218-44ae-aa3d-aba9109cecc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","blendMode":0,"displayName":"default","isLocked":false,"name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_head_colors", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_contemptor_head_colors", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_head_colors", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"74c01830-4218-44ae-aa3d-aba9109cecc2","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"54d5695e-8560-4098-8bd1-1686b108adbb","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_dread_claw/spr_dread_claw.yy b/sprites/spr_dread_claw/spr_dread_claw.yy index a959601858..761f0f75bb 100644 --- a/sprites/spr_dread_claw/spr_dread_claw.yy +++ b/sprites/spr_dread_claw/spr_dread_claw.yy @@ -66,15 +66,25 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.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/spr_dread_iron_clad/spr_dread_iron_clad.yy b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy index 193f8faabf..2d8280e01f 100644 --- a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy +++ b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy @@ -67,15 +67,25 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.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/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy index b70a168864..c2897e614c 100644 --- a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy +++ b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy @@ -64,12 +64,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7b10ebfe-7411-4619-8df5-4c9bcb341ece","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/spr_dreadnought_decorations/spr_dreadnought_decorations.yy b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy index 85357e3a03..084ec74435 100644 --- a/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy +++ b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy @@ -65,14 +65,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"aeff9adb-1df6-477e-997f-f351dba2f5af","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"09c36d69-135f-471a-8232-a16c5f00f8c6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4ca3de8-8303-4af4-9873-ba8290935271","path":"sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3a9b1205-3f6f-4058-a295-0fbc6bedd565","IsCreationKey":false,"Key":2.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/spr_gear_apoth/spr_gear_apoth.yy b/sprites/spr_gear_apoth/spr_gear_apoth.yy index 1e9544c73d..707bf0d30c 100644 --- a/sprites/spr_gear_apoth/spr_gear_apoth.yy +++ b/sprites/spr_gear_apoth/spr_gear_apoth.yy @@ -2,7 +2,7 @@ "$GMSprite":"v2", "%Name":"spr_gear_apoth", "bboxMode":0, - "bbox_bottom":44, + "bbox_bottom":41, "bbox_left":33, "bbox_right":129, "bbox_top":5, @@ -13,7 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -50,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":2.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -64,13 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","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/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png b/sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png similarity index 73% rename from sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png rename to sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png index 5d49b591024c01165e934d56a2cb0fcb473729c3..5edd5e96aa2c49ee4fa7c31e94f2d3ae3e36a5a1 100644 GIT binary patch delta 148 zcmcb{dX061H&eZ-u7QQFfoX`Lsg>4Ur?Zki@G~gOaGILXlOA>PnaO=?%kUz--)WqQF>gTe~DWM4fNZ%#C delta 148 zcmcb{dX061H&eZdu7Rblky(hLxs@pp8EP9CSQ!{h*?iRc?Mt yW?ChKk%19*4Nu?Ilmazqz%`U)=B5^xB<2?2*0bq%>?$6hCI(MeKbLh*2~7Zj":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_gear_apoth_eye", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","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, + "volume":1.0, + "xorigin":0, + "yorigin":11, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png b/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png index fb7035010b00505d0ee5bf7a1655c8ebe333ae1c..5573062f6eccdf9e7e6a2ad4f88258804903b4be 100644 GIT binary patch delta 1381 zcmZXSc~}w#7{+at+VaV(W;%n0L-PvMG{Q5l6cx>!M;=68GgCvfdDHD#hIphIPXHfK)E>I(Tvi2;Mdy4peoWt-ZCt~xeCQ-H_9XxlScv!RU)v#Ljinp+ z78%Yg&@kVuJL$F`C7j8gP z1{vX-lEkypYJ5?w@Hm>t)KCaX0$X&L`IU5=Nf%cudsf2ajS|$1vwH>{z1crk;Ve+;oHsnbti&RIM@Y_IEvmo}Q`2NK2Van2)z{;k4mdd$2r z(*%LB`ywV}7SHNC*p%anv1j<5g9)$q6y)*0cq*aO3ANI$H@#<1pJg)BO6LWO2j9Us zrF5OeP$-RSdyz??dP7ZzsJJEq!1)EqE*TApEdm2Y&&A2j*;GI% z7SJ{9F57N+K?-D`ShS3I^^@rF1M( zv~gYE8|6=V(H|x3D{h^!65S|I+%Ba?s~9W*u5lKL#8gG2r*;Jiul?)G!%s|)NA1jU zPsePN*J99pFE-$|LKpGGd5SqAUoPhAR~w>)u5S7|&hN)kEkXuk??ls|gtRG-nRT?9 zLf6!p49JeSXy@{_*mS+94sVDtxtNVRrdG`rsBl+=qYuoZ5JO~fTwSlvFHo(BJV@w%ZKg;(`|0uRW;LheMV>LThnf% z5zm@rA9{bfPYSFVJwvf<;a&>S*9c9kZ>^*BD#Rv8Z3oA%=;pSCTu+P9n|k+aaW%uc5=W8CcFU_B>K>$eW!z1oA1-c@Dk z;3HKlP6X=KxtrXN$%NU(%YnUUn)v*z3%ULEuMj$FVd)a+>|0X>!q=orpl4utbw-RM ziQFb{>@`hxn3n{J>iZF-BfMORvUts}kN`TCaUpj-Vks|SbA$f@o9axeKA|B7PCDq6 z9U&fbWMI^^JM+_YH#NtHmQZ9d8T5z1iN7>3^xFQbj1t(Y5Ly5>Cn(AQZ48Xz24~;~ zr*xrEI1~zGSdU9dNr7YRykmmUF~RVNsGzWrcqv1up|L&`rVl;k@vR~9-c}?5D+2<2 Vi_Z`kb&?z@M?0i#jrFBle*;L&!V3TZ delta 1733 zcmZXSdo|4Mv>3)z*VZ__n8u?)s)jb%x zdd#b>YDz>VjdbIx)+_Z&yi$w^C2T@d&t5y{{&Ua1=ljR^e9!045C0Rk&W};X02pjy(yXf@iN}M?58fbg}&*iPHF0MbUOHp;L zOS~WE5*D!DLzv?`1MTX;-oVWeL)YMG?o)Hj^ic3HygMFE-aQkEInEac;M>v77H&tlh~PW3)|`a++cX zGV!X!NXO8@2U{Fw_lZ>UL7Fd)>@_8faFmd6{NZql(X^I3n0l!ntJ_H39Oxw7L~F<< zvD|={0Ed*9*fLL>+Ssi7;=y=n#aSMWCxL$2|3L(&ka;&W79HSRKQum1aiOW?N0MFyFc5U7&-@ijvZt z{-7i7_V9e+rEA_xNr=L$;G&0#&S}Z~*|h~Td%}n0|8(33u8x1E^1G2z zB^_pRYjHwiFkQ1y-Eybr)F<&6uSQI5y0s+wS&YJBY<49yf1h9rP$PmEgTHeT$`Ek$oC(1?hRL5zh^K zPd{#%@g!&Ojf^C-4dOB>N3B(x^{IsR)%7BOmVZCpa(#Gr5gO;93N1zISS5fMjS@dA z9LVu&FnxQE*LC$DfF-^8N)F>Ixl#6VE@)fZN4f10SYj0YMlxq{55u@+0ImP7C<}~e zsl%V+h&h+nnf`UWV!hVtRcWe(8w0C9tp6<8-=k*l{lN!C; z(q*FZjgPF5I#_U^x^!b+F%Y~Z`H}Z#A(O2^)_Qw!$Z)@8M|!mXh5wn+VdXrW&D#>7 zAT!35oxm-qPNeUn(}f`?2kQm)?dl1|+M0L)Vj}5Oz9FR>0gOcmC-_^T4OzD}T?=hDfge7S zZ>9v=mLxJ6k)#=6zLp#*rul`j^`qN}ru1VEw})0d824ZzhIU89yEPvyAa89Dq4jz{ zuiyK?c4we~BX@gT$~V8i-X=M3^#HWqSl}%Cl^5{RF5c{lCJs0KC Zs{b_le;OQ`6Mp0{NKe1ZPu(ML{udZpYfu0H diff --git a/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png b/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png index 245943e9a55dec9331fb690471f0e05b097aabac..a28266c3d86a112c7fcc6639274f2b3fea62fd2f 100644 GIT binary patch delta 2013 zcmV<32O{|W6!a00VOIy|Nkl@u*ZN4eV6tL@)Es;P)gbo zT6YO;%o0M5eTY6m`!0nVoMZ69o@X!BM3(=OXFQTdntVSc#EG35d-U^P8qIhr0+GRf ze*ge5akH_Xz#dIy&leGu*w}3#7qZy8!}+c#%j#1P=*5O9nM7 zv?!HwAq)9>b0fDWcUth&$Ghvy^m-A|f1^ap-3euvP=(x{+;x7e`zEl~ZJrk)tw8KX zN;0OjmvP9lsHAm@(KtJElrcjYQy`?Vwgn;@(jeYB%F;sV+Vgw~X(0}2h+cD)B?p$d z(z5kwfZpTDzI)j@bU8FiNXzg?hsQL(zjhk1OW6ACWv6D|EZTE-Uz2rz`}&bre`qRc z@N`g#J4gH8EKEa{L)*~Frh`h*_w~@-kH_A?lMdxjOg-giHgG$pB$Q!P&wRGRDMBc_ zu(lE5OsEZKZF7{lc_!`&XF}eoq|mg>L<hNARqqRCAPvocTVslICk4itOF`LKbp# zHWv|*^>U@IZ|L%4F3-0u=+@H|{PP7r)pJKW?U*yy#y8>7 zem?YE&7-q<@T3#e$yCmn{O;OQHE4?E+RJpSZ=Y)1H`sLPd2~7PV=&Xuc9mQ&S36ZS z<+}Uc&z|}CvV>Dayg`gPHq@%8NH~C&nf66M$76>xNjGITZtR^Dn{U~^e>X*s!;mxO zur6JC23abn8xXroAG)U=VlOu^#ndHeGwbgNW+pq~Ox2BPfiz$Hx?dmj_v#<{-6@4y~Ft6G}UvfA*V$J@2}x-FmD!K06q8V7kn4UO&C|-gmk=-F?2xg?D{9 z=2H=0k};=NHSK`d!ExUNCX{bqfAcQ?^6FSbc0;PIPpj0ZL((y)*3FvVYt`)f>9xFl z{Vf7cHF8f2UaNil%j~reYq# zt)LydPxQyXvQ=wh{MNhs@+tXubuH{H+-shWmcJ>AObnT+ppi5V_MGoqwp zPHl|m+i8hKtCWFpXDE2~`K<(W1ldmfaL1jl%d6ww74+@vZ|$^_wl0_FIKCFVMmbT0 zfM%97oW3qSHM=Vhe^qJaN^*^OKJ175lI{?RgpaM~T6bu@1hHIMCgJU$-Lc>4=JcR0 z-7sCdd$dS9wvM`F?beN4J4D)>1NF%E86sm}FyDWCDephN3@+o{hZpkh!wdDkG2ReJ zBiWeKozn4DEqk8x{l}NmG);S3MC9|Q@9ksVK)(C%LcaX{f8&0yeIxBUsgm_eQaQDc z0&8apg)~hgP1Cd?^;OD!+{31XwjNn_hyb|Wj32_eVNMn}_swA6W)Hm%$)}P;`gOB*H}28`>aIsbyvOsYnspiFq6&TIJooJ& ziHJPAc-}nvfAdkZUas2PA|md0s%AZsh10#5g0G7g5qbRTiCkVC?;MI0x!+0B0&4!| z>6^crU*|u)r}{m+cpkhTWlCN--A_ikhZRj&AHRCCHU6||-MJZOnqayCG`};qMW~v! z$vV%eoiVf(){A-L2Goo}?Xjo{rU{>6hta)nXfQeXe|BQB} zIIfkHSMqM%zMhf$-5!U!Hk*w+e)FW!zKiHxxLYl$nsw9WIiruO%o*ifrjAVY+_y|^ z=f|#|f9wR+FUusni1oivSXbt7%+}|t&TkC28`t*O31;20h10Mv9b;QBSB*O^?ZU2_ zRLg0}9!^6$8Msd%&28o~r)!jOZhd%cd4IcW<l ze@ZCp5wmfM4=BN`ONs_6uA3*6bxPGx#Z*y(S+A6hHEKW!W&LtATJ~<9U`|7>hRae# z3FWlpY`~-eC79DQMk7Y;<_YC=jn$ZYt7v--r9g-Y=CqC3px%HkWFcQ~ZshjluDvR< zdw(IX0SS%y(cszdFSR<}p4_Q_L@*zYDpDGEr;7T%7xui7P)Uv4^?L9nJ!d3TVnh2v zTH

LjMD6cxN7cyxVV++X){MF*Q0eFgh|dD=;uRFfdZo15T3+3Lg?NH99gdIx;mY vFfckWFe8b(@{>IZA|5d{Ix;XiGBqnOFgh?Wbex(k00000NkvXXu0mjfQo<48 delta 2462 zcmV;P31Rm15&aa9VOiCNk#B?RBn>)vwMSI|OUN}&szV{oD8=_Q)T8c8F~NE(gv{gfqM+dDJ1etx9U zjHe=z!FQ3+3V%m#HTMP#XcxA>A@hH`JlS3Ku zH-z-KPE^krqq`)W?59yWlGUFy*bL1p-jmW(p2vS5}MK=&N<53LTMV#msU+XD%h!hYVjkYJl5)*ajydyvZZ*xy0#W^5j%RL~bu{tm~V){FKXcy%%)r`FSg6>VK-{THeW%(_Ta<1fa*Pg3Eb1YY1rdfSss&QC(#xIq_pM)zEsC zyuG~XRneU5j(wax^Z6ACr-(R%m~w1rtDYkM0BTmY9|AfbJ)Bv(DZO!1@1*El%XWPz zB7Y7;t}KUj>Cy`*QaR0l=w15MJ#`;_xt=Mekf5!!zayB1^un2|8?yyc{S0-#F6#M1 zVfV}k!~|^>`Fu>2>wD`W;trd+Gjw}-GwDO&8f&Wi9bG#?t6cVO-3*9%d#Xm7Zkg&Q z=hznInBh!TO>A?JwvbM(nmQFqJ)ruBgMU5mWwCbaspk0fVCaDfnd5wW|E=?}NBc+p z?Y(TA>nkyziuAIKIc-%_4~QNd^FyFQ`SkI%bNR2|tVN_BQrr4$l^V;Cb7JukS2gyuExXjwD5RAwoURi*e8C*U{5#(VfvUMIws0n&Vt>&q znyqV96>|);f{KWDyh#OJj;!;Xw((|(F4k5p3FY!+>(*W4O*1r8s-|LAPqT75CgVdc zF~g;3W|VczX&d9Yc3M)gRZ7pe(-%Db{8j=wgJLIsnBz{<>o@D@3i|Z%bvLbKTbIdk z9N!ka)^ef<0WB5A&w&7(!OW9wL!qTRYuYKO@7;lOef`wo#Z6wK!@AIkHW553EHws|1W zHV>?i&GCUi9@)m6=9G@BYU%Tw&tE>2wr#uHA|k)O`m=kk8OUdw2lCtYuYWIl?R)9g zNtIl_ES1ytRbbm$LOyNVO53(wNL`h3hiFw zB1OLJB-sM0{^tHK-?jg|_}h7^-}e_kcppcdvR6*?n~~;WMHSY&XZH@qpE_H2uEv=v zm}UUged@LdRdZ>A!kOv|Z?-dr4#IkI+L{4XV^Do8s)DJ)r|4lcAAg&={ha(!-e5Qz zY2^CdR<7S|M_-Xcv3+G%-R_=qaoUP}`4XG!Ut6WL{Z4njT&{-eoicX)ZYv@p>$6Q% zNPU+->|HkI;jAY)DXnf_+yw7%nBBN-k3ICN z#%3sEhc3t?IGkqnRP-vUp66SJtAgHM-n8bpG=yF?L#ri~a(@}3DyJ);BH{JNfaa^WOBB?e$Pm=V4ZXcI>!qeYWvd zsks_hub$i8m57LZc)#l&*8}Q$UHore<`Hyk-Bl5l_1Q)~yx(<=ue04(QX`FQcUN7t z)Pp&Map=5)_SStSIqrS(jv! z@Fp{)>hE)#QY{H(U93|{AyYZ3(!_)ycQtLKi4LW{Z2|MK>i6dg>Ch1;g1Ia?8h>c;*u44Jl#?}vmTkF@P%cESh8nD* zy0IsKj950oT#%fN6&29b2<7sXXtd(jVkel#p;W^asiK7PxRh+btN|sM$7ha4Oxn#8 z%HuUxV+PNOModW&%p)^rgL;q6|FPT2$Ma9!HJi-GD|rpbXz+?38LdA5SgYg5^H0`4 zB7c})k6Iend8WOid#`1?kx@;J9C|(Ynzk7k)!5Lkkk+`Z$moAKT%jZT+bPTd001R) zMObuXVRU6WV{&C-bY%cCFfuhQFgPtRG*mJ&Ix{djH8(3TFgh?W4-)4+0000bbVXQn zWMOn=I&E)cX=Zr#$G7vg5Fgi6iD=;uRFfe{kUxAaf2qGRbGCDIb cIyE;dFfckWFezGoUH||907*qoM6N<$f)hvgqW}N^ diff --git a/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png index fb7035010b00505d0ee5bf7a1655c8ebe333ae1c..5573062f6eccdf9e7e6a2ad4f88258804903b4be 100644 GIT binary patch delta 1381 zcmZXSc~}w#7{+at+VaV(W;%n0L-PvMG{Q5l6cx>!M;=68GgCvfdDHD#hIphIPXHfK)E>I(Tvi2;Mdy4peoWt-ZCt~xeCQ-H_9XxlScv!RU)v#Ljinp+ z78%Yg&@kVuJL$F`C7j8gP z1{vX-lEkypYJ5?w@Hm>t)KCaX0$X&L`IU5=Nf%cudsf2ajS|$1vwH>{z1crk;Ve+;oHsnbti&RIM@Y_IEvmo}Q`2NK2Van2)z{;k4mdd$2r z(*%LB`ywV}7SHNC*p%anv1j<5g9)$q6y)*0cq*aO3ANI$H@#<1pJg)BO6LWO2j9Us zrF5OeP$-RSdyz??dP7ZzsJJEq!1)EqE*TApEdm2Y&&A2j*;GI% z7SJ{9F57N+K?-D`ShS3I^^@rF1M( zv~gYE8|6=V(H|x3D{h^!65S|I+%Ba?s~9W*u5lKL#8gG2r*;Jiul?)G!%s|)NA1jU zPsePN*J99pFE-$|LKpGGd5SqAUoPhAR~w>)u5S7|&hN)kEkXuk??ls|gtRG-nRT?9 zLf6!p49JeSXy@{_*mS+94sVDtxtNVRrdG`rsBl+=qYuoZ5JO~fTwSlvFHo(BJV@w%ZKg;(`|0uRW;LheMV>LThnf% z5zm@rA9{bfPYSFVJwvf<;a&>S*9c9kZ>^*BD#Rv8Z3oA%=;pSCTu+P9n|k+aaW%uc5=W8CcFU_B>K>$eW!z1oA1-c@Dk z;3HKlP6X=KxtrXN$%NU(%YnUUn)v*z3%ULEuMj$FVd)a+>|0X>!q=orpl4utbw-RM ziQFb{>@`hxn3n{J>iZF-BfMORvUts}kN`TCaUpj-Vks|SbA$f@o9axeKA|B7PCDq6 z9U&fbWMI^^JM+_YH#NtHmQZ9d8T5z1iN7>3^xFQbj1t(Y5Ly5>Cn(AQZ48Xz24~;~ zr*xrEI1~zGSdU9dNr7YRykmmUF~RVNsGzWrcqv1up|L&`rVl;k@vR~9-c}?5D+2<2 Vi_Z`kb&?z@M?0i#jrFBle*;L&!V3TZ delta 1733 zcmZXSdo|4Mv>3)z*VZ__n8u?)s)jb%x zdd#b>YDz>VjdbIx)+_Z&yi$w^C2T@d&t5y{{&Ua1=ljR^e9!045C0Rk&W};X02pjy(yXf@iN}M?58fbg}&*iPHF0MbUOHp;L zOS~WE5*D!DLzv?`1MTX;-oVWeL)YMG?o)Hj^ic3HygMFE-aQkEInEac;M>v77H&tlh~PW3)|`a++cX zGV!X!NXO8@2U{Fw_lZ>UL7Fd)>@_8faFmd6{NZql(X^I3n0l!ntJ_H39Oxw7L~F<< zvD|={0Ed*9*fLL>+Ssi7;=y=n#aSMWCxL$2|3L(&ka;&W79HSRKQum1aiOW?N0MFyFc5U7&-@ijvZt z{-7i7_V9e+rEA_xNr=L$;G&0#&S}Z~*|h~Td%}n0|8(33u8x1E^1G2z zB^_pRYjHwiFkQ1y-Eybr)F<&6uSQI5y0s+wS&YJBY<49yf1h9rP$PmEgTHeT$`Ek$oC(1?hRL5zh^K zPd{#%@g!&Ojf^C-4dOB>N3B(x^{IsR)%7BOmVZCpa(#Gr5gO;93N1zISS5fMjS@dA z9LVu&FnxQE*LC$DfF-^8N)F>Ixl#6VE@)fZN4f10SYj0YMlxq{55u@+0ImP7C<}~e zsl%V+h&h+nnf`UWV!hVtRcWe(8w0C9tp6<8-=k*l{lN!C; z(q*FZjgPF5I#_U^x^!b+F%Y~Z`H}Z#A(O2^)_Qw!$Z)@8M|!mXh5wn+VdXrW&D#>7 zAT!35oxm-qPNeUn(}f`?2kQm)?dl1|+M0L)Vj}5Oz9FR>0gOcmC-_^T4OzD}T?=hDfge7S zZ>9v=mLxJ6k)#=6zLp#*rul`j^`qN}ru1VEw})0d824ZzhIU89yEPvyAa89Dq4jz{ zuiyK?c4we~BX@gT$~V8i-X=M3^#HWqSl}%Cl^5{RF5c{lCJs0KC Zs{b_le;OQ`6Mp0{NKe1ZPu(ML{udZpYfu0H diff --git a/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png index 245943e9a55dec9331fb690471f0e05b097aabac..a28266c3d86a112c7fcc6639274f2b3fea62fd2f 100644 GIT binary patch delta 2013 zcmV<32O{|W6!a00VOIy|Nkl@u*ZN4eV6tL@)Es;P)gbo zT6YO;%o0M5eTY6m`!0nVoMZ69o@X!BM3(=OXFQTdntVSc#EG35d-U^P8qIhr0+GRf ze*ge5akH_Xz#dIy&leGu*w}3#7qZy8!}+c#%j#1P=*5O9nM7 zv?!HwAq)9>b0fDWcUth&$Ghvy^m-A|f1^ap-3euvP=(x{+;x7e`zEl~ZJrk)tw8KX zN;0OjmvP9lsHAm@(KtJElrcjYQy`?Vwgn;@(jeYB%F;sV+Vgw~X(0}2h+cD)B?p$d z(z5kwfZpTDzI)j@bU8FiNXzg?hsQL(zjhk1OW6ACWv6D|EZTE-Uz2rz`}&bre`qRc z@N`g#J4gH8EKEa{L)*~Frh`h*_w~@-kH_A?lMdxjOg-giHgG$pB$Q!P&wRGRDMBc_ zu(lE5OsEZKZF7{lc_!`&XF}eoq|mg>L<hNARqqRCAPvocTVslICk4itOF`LKbp# zHWv|*^>U@IZ|L%4F3-0u=+@H|{PP7r)pJKW?U*yy#y8>7 zem?YE&7-q<@T3#e$yCmn{O;OQHE4?E+RJpSZ=Y)1H`sLPd2~7PV=&Xuc9mQ&S36ZS z<+}Uc&z|}CvV>Dayg`gPHq@%8NH~C&nf66M$76>xNjGITZtR^Dn{U~^e>X*s!;mxO zur6JC23abn8xXroAG)U=VlOu^#ndHeGwbgNW+pq~Ox2BPfiz$Hx?dmj_v#<{-6@4y~Ft6G}UvfA*V$J@2}x-FmD!K06q8V7kn4UO&C|-gmk=-F?2xg?D{9 z=2H=0k};=NHSK`d!ExUNCX{bqfAcQ?^6FSbc0;PIPpj0ZL((y)*3FvVYt`)f>9xFl z{Vf7cHF8f2UaNil%j~reYq# zt)LydPxQyXvQ=wh{MNhs@+tXubuH{H+-shWmcJ>AObnT+ppi5V_MGoqwp zPHl|m+i8hKtCWFpXDE2~`K<(W1ldmfaL1jl%d6ww74+@vZ|$^_wl0_FIKCFVMmbT0 zfM%97oW3qSHM=Vhe^qJaN^*^OKJ175lI{?RgpaM~T6bu@1hHIMCgJU$-Lc>4=JcR0 z-7sCdd$dS9wvM`F?beN4J4D)>1NF%E86sm}FyDWCDephN3@+o{hZpkh!wdDkG2ReJ zBiWeKozn4DEqk8x{l}NmG);S3MC9|Q@9ksVK)(C%LcaX{f8&0yeIxBUsgm_eQaQDc z0&8apg)~hgP1Cd?^;OD!+{31XwjNn_hyb|Wj32_eVNMn}_swA6W)Hm%$)}P;`gOB*H}28`>aIsbyvOsYnspiFq6&TIJooJ& ziHJPAc-}nvfAdkZUas2PA|md0s%AZsh10#5g0G7g5qbRTiCkVC?;MI0x!+0B0&4!| z>6^crU*|u)r}{m+cpkhTWlCN--A_ikhZRj&AHRCCHU6||-MJZOnqayCG`};qMW~v! z$vV%eoiVf(){A-L2Goo}?Xjo{rU{>6hta)nXfQeXe|BQB} zIIfkHSMqM%zMhf$-5!U!Hk*w+e)FW!zKiHxxLYl$nsw9WIiruO%o*ifrjAVY+_y|^ z=f|#|f9wR+FUusni1oivSXbt7%+}|t&TkC28`t*O31;20h10Mv9b;QBSB*O^?ZU2_ zRLg0}9!^6$8Msd%&28o~r)!jOZhd%cd4IcW<l ze@ZCp5wmfM4=BN`ONs_6uA3*6bxPGx#Z*y(S+A6hHEKW!W&LtATJ~<9U`|7>hRae# z3FWlpY`~-eC79DQMk7Y;<_YC=jn$ZYt7v--r9g-Y=CqC3px%HkWFcQ~ZshjluDvR< zdw(IX0SS%y(cszdFSR<}p4_Q_L@*zYDpDGEr;7T%7xui7P)Uv4^?L9nJ!d3TVnh2v zTH

LjMD6cxN7cyxVV++X){MF*Q0eFgh|dD=;uRFfdZo15T3+3Lg?NH99gdIx;mY vFfckWFe8b(@{>IZA|5d{Ix;XiGBqnOFgh?Wbex(k00000NkvXXu0mjfQo<48 delta 2462 zcmV;P31Rm15&aa9VOiCNk#B?RBn>)vwMSI|OUN}&szV{oD8=_Q)T8c8F~NE(gv{gfqM+dDJ1etx9U zjHe=z!FQ3+3V%m#HTMP#XcxA>A@hH`JlS3Ku zH-z-KPE^krqq`)W?59yWlGUFy*bL1p-jmW(p2vS5}MK=&N<53LTMV#msU+XD%h!hYVjkYJl5)*ajydyvZZ*xy0#W^5j%RL~bu{tm~V){FKXcy%%)r`FSg6>VK-{THeW%(_Ta<1fa*Pg3Eb1YY1rdfSss&QC(#xIq_pM)zEsC zyuG~XRneU5j(wax^Z6ACr-(R%m~w1rtDYkM0BTmY9|AfbJ)Bv(DZO!1@1*El%XWPz zB7Y7;t}KUj>Cy`*QaR0l=w15MJ#`;_xt=Mekf5!!zayB1^un2|8?yyc{S0-#F6#M1 zVfV}k!~|^>`Fu>2>wD`W;trd+Gjw}-GwDO&8f&Wi9bG#?t6cVO-3*9%d#Xm7Zkg&Q z=hznInBh!TO>A?JwvbM(nmQFqJ)ruBgMU5mWwCbaspk0fVCaDfnd5wW|E=?}NBc+p z?Y(TA>nkyziuAIKIc-%_4~QNd^FyFQ`SkI%bNR2|tVN_BQrr4$l^V;Cb7JukS2gyuExXjwD5RAwoURi*e8C*U{5#(VfvUMIws0n&Vt>&q znyqV96>|);f{KWDyh#OJj;!;Xw((|(F4k5p3FY!+>(*W4O*1r8s-|LAPqT75CgVdc zF~g;3W|VczX&d9Yc3M)gRZ7pe(-%Db{8j=wgJLIsnBz{<>o@D@3i|Z%bvLbKTbIdk z9N!ka)^ef<0WB5A&w&7(!OW9wL!qTRYuYKO@7;lOef`wo#Z6wK!@AIkHW553EHws|1W zHV>?i&GCUi9@)m6=9G@BYU%Tw&tE>2wr#uHA|k)O`m=kk8OUdw2lCtYuYWIl?R)9g zNtIl_ES1ytRbbm$LOyNVO53(wNL`h3hiFw zB1OLJB-sM0{^tHK-?jg|_}h7^-}e_kcppcdvR6*?n~~;WMHSY&XZH@qpE_H2uEv=v zm}UUged@LdRdZ>A!kOv|Z?-dr4#IkI+L{4XV^Do8s)DJ)r|4lcAAg&={ha(!-e5Qz zY2^CdR<7S|M_-Xcv3+G%-R_=qaoUP}`4XG!Ut6WL{Z4njT&{-eoicX)ZYv@p>$6Q% zNPU+->|HkI;jAY)DXnf_+yw7%nBBN-k3ICN z#%3sEhc3t?IGkqnRP-vUp66SJtAgHM-n8bpG=yF?L#ri~a(@}3DyJ);BH{JNfaa^WOBB?e$Pm=V4ZXcI>!qeYWvd zsks_hub$i8m57LZc)#l&*8}Q$UHore<`Hyk-Bl5l_1Q)~yx(<=ue04(QX`FQcUN7t z)Pp&Map=5)_SStSIqrS(jv! z@Fp{)>hE)#QY{H(U93|{AyYZ3(!_)ycQtLKi4LW{Z2|MK>i6dg>Ch1;g1Ia?8h>c;*u44Jl#?}vmTkF@P%cESh8nD* zy0IsKj950oT#%fN6&29b2<7sXXtd(jVkel#p;W^asiK7PxRh+btN|sM$7ha4Oxn#8 z%HuUxV+PNOModW&%p)^rgL;q6|FPT2$Ma9!HJi-GD|rpbXz+?38LdA5SgYg5^H0`4 zB7c})k6Iend8WOid#`1?kx@;J9C|(Ynzk7k)!5Lkkk+`Z$moAKT%jZT+bPTd001R) zMObuXVRU6WV{&C-bY%cCFfuhQFgPtRG*mJ&Ix{djH8(3TFgh?W4-)4+0000bbVXQn zWMOn=I&E)cX=Zr#$G7vg5Fgi6iD=;uRFfe{kUxAaf2qGRbGCDIb cIyE;dFfckWFezGoUH||907*qoM6N<$f)hvgqW}N^ diff --git a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy index b8a251d175..f33cbde28f 100644 --- a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy +++ b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fccfa962-e4f5-4e06-b0b0-0691b6b00da5","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/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png b/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png new file mode 100644 index 0000000000000000000000000000000000000000..1abd8ff743b7eaefc238013f78115001ff038ee9 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slEO3u^8F{I+w+v|>e zOo{?52ac70_&@z;|Hr24g6orAE`$gQ9m;gFI-mm7Ogva~Jxu(AeAV3V@6JuTS{3@r zWIZ!?e6g$#}ATc~H~$A5pOeO|6gb*0K<&GR$neevIEslLK6>ej|K-!F?9 zFL7*Kn6AJoOuU`cSNUMMEkjPS+dq+KTs}b4RZCnWN>UO_QmvAUQh^kMk%5t^u7QQF zfk}v=iIt(Hm5Hggfq|8QfzGXY?I;>@^HVa@DsgLwZCA4fYS4h&P?DLOT3nKtTYy^+ T*Ch5QAU}J$`njxgN@xNA<^z1# literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png b/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png new file mode 100644 index 0000000000000000000000000000000000000000..e1666a53138feb53bb6e840b6bf05f32ddc2bba8 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(`R(cA7*cWT?R7)0 z0}28x4qyM*?-QArF!_{l@{G(aHq*Wy09i@`cwkfdoxxt{aO^tHmKn-PFVglVPkp;& zTQx();yIqbw$=DO(^Q}TbmsGqicBP!N`0kbyBLZYS@|Sx{m=m#u3F+6QIe8al4_M) zlnSI6j0}uSbqy?Z4NO7|O{@$ptxQa{4GgRd40LYIYe&(Lo1c=IR*73fY`dB@P=f~C fhLX(O)Z&uF+ydNsxF)eb0eRWe)z4*}Q$iB}1ek1( literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png new file mode 100644 index 0000000000000000000000000000000000000000..58dc547f3d7221096434d831dcebb7068476523b GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slEO3u^8F{I+w+v|>e zOo{?52ac70_&@z;|Hr24g6orAE`$gQ9m;gFI-mm7Ogva~Jxu(AeAV3V@6JuTS{3@r zWIZ!?e6g$#}ATc~H~$A5pOeO|6gb*0K<&GR$neevIEslLK6>ej|K-!F?9 zFL7*Kn6AJoOuU`cSNUMMEkjPS+dq+KTs}b4RZCnWN>UO_QmvAUQh^kMk%5tku7Rnp zk#UHTk(Gh5m9e3=fq|8Q!Nq;E&ZB6^%}>cptHiBg!DFRjpau=N4JDbmsl_FUxdpiO TeE-J02IOZ?S3j3^P645bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(`R(cA7*cWT?R7)0 z0}28x4qyM*?-QArF!_{l@{G(aHq*Wy09i@`cwkfdoxxt{aO^tHmKn-PFVglVPkp;& zTQx();yIqbw$=DO(^Q}TbmsGqicBP!N`0kbyBLZYS@|Sx{m=m#u3F+6QIe8al4_M) zlnSI6j0}uSbPY^(jf_K#46RJftc(n_4GgRd3?^QmrHi5=H$NpatrE9}2VF`Nff_X6 fHk4%MrWThZ<`&@Avwc3ZAIQs|u6{1-oD!M45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}slE%E;5jF{I+w+v^v3 zn+!x8E?#>faPHBcGlv9JuIyiyY0$93!S=a$MdPz&OB8|ni2-v0-sHXXDUL3>`X43JsR!C z<~{g-BEQy6GC(#<^496+tADecysm3|!QuxocGFzV0eu_B6D?N1L$`}>1zM(B;u=ws zl30>zm0Xkxq!^40j7)S5OmvNmLyQcqObo3|jkFC6tPBi(*dF_Xq9HdwB{QuOw}#Gy mItQQz4Y&;@nYpROC5gEOxb@sCjh_$H!{F)a=d#Wzp$PymCyliL literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png new file mode 100644 index 0000000000000000000000000000000000000000..ca49a8f02c93d50d9dab93b0521d29488a02b046 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(IqvD=7*cWT?Lk9E zAn(wEul~85{tJN2Aq6U=j=f`G%!t0W8R%@)64!{5l*E!$tK_0oAjM#0U}U0eV4`be z9Aac>WnyS$YNTyoU}a$N!}i!86b-rgDVb@NxHWVp)Hwh(XuxeK$;?eHE=kNSz^&(A SY5aVk9tKZWKbLh*2~7aagHe?L literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png new file mode 100644 index 0000000000000000000000000000000000000000..ca49a8f02c93d50d9dab93b0521d29488a02b046 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^%NZCL1vuD%tgGu%rUEI2WRD45bDP46hOx7_4S6Fo+k-*%fF5lweEpc6VX;4}uH!E}sk(IqvD=7*cWT?Lk9E zAn(wEul~85{tJN2Aq6U=j=f`G%!t0W8R%@)64!{5l*E!$tK_0oAjM#0U}U0eV4`be z9Aac>WnyS$YNTyoU}a$N!}i!86b-rgDVb@NxHWVp)Hwh(XuxeK$;?eHE=kNSz^&(A SY5aVk9tKZWKbLh*2~7aagHe?L literal 0 HcmV?d00001 diff --git a/sprites/spr_sgt_forehead/spr_sgt_forehead.yy b/sprites/spr_sgt_forehead/spr_sgt_forehead.yy new file mode 100644 index 0000000000..38ebdd4f70 --- /dev/null +++ b/sprites/spr_sgt_forehead/spr_sgt_forehead.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_sgt_forehead", + "bboxMode":0, + "bbox_bottom":78, + "bbox_left":79, + "bbox_right":87, + "bbox_top":70, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4ff43f57-b34a-4219-8298-0399265c623b","blendMode":0,"displayName":"default","isLocked":false,"name":"4ff43f57-b34a-4219-8298-0399265c623b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_sgt_forehead", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"decorations", + "path":"folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_sgt_forehead", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_sgt_forehead", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.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":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.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":0, + "yorigin":51, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png b/sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png new file mode 100644 index 0000000000000000000000000000000000000000..78ae7850ce221d89cd38975f2fcce7baa0a28d89 GIT binary patch literal 4878 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 ay>PCN|Fce1ipZ;faYE@D>X5Xp!~O?}eGgRt literal 0 HcmV?d00001 diff --git a/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png b/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png new file mode 100644 index 0000000000000000000000000000000000000000..78ae7850ce221d89cd38975f2fcce7baa0a28d89 GIT binary patch literal 4878 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 ay>PCN|Fce1ipZ;faYE@D>X5Xp!~O?}eGgRt literal 0 HcmV?d00001 diff --git a/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy b/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy new file mode 100644 index 0000000000..5d386c8d61 --- /dev/null +++ b/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_twl_Volkite_Culverins", + "bboxMode":0, + "bbox_bottom":173, + "bbox_left":203, + "bbox_right":287, + "bbox_top":77, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","blendMode":0,"displayName":"default","isLocked":false,"name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_twl_Volkite_Culverins", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_twl_Volkite_Culverins", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_twl_Volkite_Culverins", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.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":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a3b8ccb-c022-4cad-95b2-9d1f0d2d8c12","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, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file From 8429c50d5e2a51bd344f965bc4f241fc0e40d565 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Thu, 7 Aug 2025 16:59:36 +0100 Subject: [PATCH 08/13] fix some complex rules --- scripts/scr_ComplexSet/scr_ComplexSet.gml | 10 ++------ .../scr_culture_visuals.gml | 15 ++++++++--- .../3368318c-d87a-46c2-891b-f8d5cebbf275.png | Bin 2130 -> 1637 bytes .../6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png | Bin 0 -> 5951 bytes .../23f60daa-fe76-4e85-9875-adbeb4cce378.png | Bin 2130 -> 1637 bytes .../23f60daa-fe76-4e85-9875-adbeb4cce378.png | Bin 0 -> 5951 bytes .../spr_pack_brazier3/spr_pack_brazier3.yy | 24 ++++++++++-------- 7 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 sprites/spr_pack_brazier3/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png create mode 100644 sprites/spr_pack_brazier3/layers/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b/23f60daa-fe76-4e85-9875-adbeb4cce378.png diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 61243fd919..d72f2a0bfc 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -145,10 +145,7 @@ function ComplexSet(_unit) constructor { if (struct_exists(_mod, "allow_either")) { _are_exceptions = true; - exceptions = []; - for (var m = 0; m < array_length(_mod.allow_either); m++) { - array_push(exceptions, _mod.allow_either[m]); - } + exceptions = variable_clone(_mod.allow_either); } if (struct_exists(_mod, "max_saturation")) { var _max_sat = _mod.max_saturation; @@ -209,10 +206,7 @@ function ComplexSet(_unit) constructor { } } if (!_viable) { - if (!check_exception("chapter_adv")) { - return false; - } - if (!check_exception("chapter_disadv")) { + if (!check_exception("role_type")) { return false; } } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 0656451694..a990f62721 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -471,8 +471,9 @@ global.modular_drawing_items = [ body_types :[0], allow_either : ["chapter_adv", "traits","role_type"], role_type : [SPECIALISTS_CHAPLAINS], - position : "backpack", - assign_by_rank : 3, + position : "backpack_decoration", + assign_by_rank : 4, + max_saturation : 40, }, { sprite : spr_gear_librarian, @@ -1406,7 +1407,15 @@ function DummyMarine()constructor{ return is_specialist(role(), search_type,include_trainee, include_heads); } static has_trait = marine_has_trait; - + static is_dreadnought = function(){ + _arm_data = gear_weapon_data("armour", last_armour); + if (is_struct(_arm_data)){ + if (_arm_data.has_tag("dreadnought")){ + return true + } + } + return false; + } experience = 120; } diff --git a/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png b/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png index 3bd309f808aaeb32807f91c057f7f8214fa9b0ff..f9198ae1c57ce6f231600f0c6793e6de9964c39b 100644 GIT binary patch delta 1391 zcmZuxdr;B|5cbYV&qvzSOqN<&VQPmbA&MxOWLjWCQm0WWT7rkEB$9>(%z0PVQKtcy zhaz29K4>N~(;V@^SyPE9oZutzag`{k_&D*WDWXUJ-5>4j%vxE&Z@VJJMOu8 z5_@d3y{o;ImDOhS@uPT)eQ0I%)sb&(EFSxx-1Iwp!r7b7ppT+XU(wEJaU4+EF57u( zpJpTdwSkr}uvw!C->09nTVPtfYcUCC_XR5as$ z&?NVvnDKVa>mE=+=|JR-3w%0OF_QkW$Y*Dr>6yk_3N3C(*syG@nY$XHXo}{wSsNml zLT)O)oDY&id1ZXE0MC1lj$@{|JGY;t&HnvE zXsS7j3}kO7kb1zHes&o*MlTMmq~M`Ad73X;IgWH3^XrgR!ZIiF_bvp1_jJW7d(l7BB+ioC9I2#RcLYAA=Y8G8%B9(=ggl~VOTk1Kaek-xQI~3 zZuceVG;6`f2s(_^vVlmAoTC0w#LXeT9@^vI?@*ZUmzY?ofN{F&j-$mIFijX45F?%; zzn>3RMnF0X6PN)5ysjyZrISbzIYFWEaSJaKKr!g}Vs+p2Spx8U0&YT0}j2%&gl5S*Wk^*d`cOw%k#%r(|QW>`tzkp`- zW^8u`&XT)Z?)|tMqhz|0Q2m?}G_S;8>uNHke0Og|C)7W!jF1eG z6O&`OOPW-m;;KK74V?a+B&{dZ%M`akaBeE_Q%ePhj!^E^s6uhf59}G*nA}3!$j1Rx>@D`VDlXl0qUbe_IR0BWRGR5AV8HHlS% z)VthBQ!Z<@ze4vL)tfqk*5=U~a|J=1uBpB*F1vTA5j$=ed|PFx_S3MQlBP%cDA=~_ zfaN*1P?y97PlFUEWLMmmpB?rZ+<*o1g`x20PJ*m;i5d z5KOEvZO*_>jI!139BRF}tf(oYsEe^XsMvVPG-m5D8ofFd5+QH8a6wpC?i|*#yuv+0(`YoK`a)^N5PdhI0JiSy<`mw_oUSJ`tyhRi8!xjhL9K7W zMZmm9GqstSqo3-=XiExyH!8NoouBr=6W8{^QWLOVxK`JW$H?x(rCT9_;1^0FTLb8?M+7%)7%gbFR&jF8NS1LY|J#z0RY3%OP_RW=|xam z=f3A*hdCC`n_`K>QLTpN0kg@&Lp}P!5)$_i-@Rr}Bg2apcUl0-TdbT{{hAT|O-atl z>)f39C|M`@jOZrC^QFMva`|bZYaI8^^C>=vymW(0Fn`E5LT<6boLLd;2?lB|py{&8f7jju8=Wv#<US+x3 delta 1820 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 CIkdI_ literal 0 HcmV?d00001 diff --git a/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png b/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png index 3bd309f808aaeb32807f91c057f7f8214fa9b0ff..f9198ae1c57ce6f231600f0c6793e6de9964c39b 100644 GIT binary patch delta 1391 zcmZuxdr;B|5cbYV&qvzSOqN<&VQPmbA&MxOWLjWCQm0WWT7rkEB$9>(%z0PVQKtcy zhaz29K4>N~(;V@^SyPE9oZutzag`{k_&D*WDWXUJ-5>4j%vxE&Z@VJJMOu8 z5_@d3y{o;ImDOhS@uPT)eQ0I%)sb&(EFSxx-1Iwp!r7b7ppT+XU(wEJaU4+EF57u( zpJpTdwSkr}uvw!C->09nTVPtfYcUCC_XR5as$ z&?NVvnDKVa>mE=+=|JR-3w%0OF_QkW$Y*Dr>6yk_3N3C(*syG@nY$XHXo}{wSsNml zLT)O)oDY&id1ZXE0MC1lj$@{|JGY;t&HnvE zXsS7j3}kO7kb1zHes&o*MlTMmq~M`Ad73X;IgWH3^XrgR!ZIiF_bvp1_jJW7d(l7BB+ioC9I2#RcLYAA=Y8G8%B9(=ggl~VOTk1Kaek-xQI~3 zZuceVG;6`f2s(_^vVlmAoTC0w#LXeT9@^vI?@*ZUmzY?ofN{F&j-$mIFijX45F?%; zzn>3RMnF0X6PN)5ysjyZrISbzIYFWEaSJaKKr!g}Vs+p2Spx8U0&YT0}j2%&gl5S*Wk^*d`cOw%k#%r(|QW>`tzkp`- zW^8u`&XT)Z?)|tMqhz|0Q2m?}G_S;8>uNHke0Og|C)7W!jF1eG z6O&`OOPW-m;;KK74V?a+B&{dZ%M`akaBeE_Q%ePhj!^E^s6uhf59}G*nA}3!$j1Rx>@D`VDlXl0qUbe_IR0BWRGR5AV8HHlS% z)VthBQ!Z<@ze4vL)tfqk*5=U~a|J=1uBpB*F1vTA5j$=ed|PFx_S3MQlBP%cDA=~_ zfaN*1P?y97PlFUEWLMmmpB?rZ+<*o1g`x20PJ*m;i5d z5KOEvZO*_>jI!139BRF}tf(oYsEe^XsMvVPG-m5D8ofFd5+QH8a6wpC?i|*#yuv+0(`YoK`a)^N5PdhI0JiSy<`mw_oUSJ`tyhRi8!xjhL9K7W zMZmm9GqstSqo3-=XiExyH!8NoouBr=6W8{^QWLOVxK`JW$H?x(rCT9_;1^0FTLb8?M+7%)7%gbFR&jF8NS1LY|J#z0RY3%OP_RW=|xam z=f3A*hdCC`n_`K>QLTpN0kg@&Lp}P!5)$_i-@Rr}Bg2apcUl0-TdbT{{hAT|O-atl z>)f39C|M`@jOZrC^QFMva`|bZYaI8^^C>=vymW(0Fn`E5LT<6boLLd;2?lB|py{&8f7jju8=Wv#<US+x3 delta 1820 zcmZ`)c~H|=9*?ygw#d3_2T_i}1p*=@gg`h1q+EuO6cPd=C<4C(gF+;7tWbywi>;y{ zzd%UBWg$>d0wo;f5Oi1yAtYERVgiKSCB({M1PK~0_vg;e&g>tZdEa^S-kZ*IQj()2HTH4<41(S_83F;wZ1MiGZ@+Mmj@Q7>3aTHKcBF_%2#H- zxqIxDsoq=l=%seO+@5aXSbr$=gKJ6QOmZ}uD z&r`GC^79~sGYg$(R_<%d-xWT}&MZPwB1X=*;3J<4Qek*F^uB_L{q6Xz2RDa<68A^*F)wc z1A=!Nd$pQ)&YmC5>O_|mUloudnqTqPR(gvqC;J)A z+n!qu6SV~JGHq=t*_s~1XpO!zdZ4$cj)k6#<&IPBrfEV?4`w2`(nfQVGFxNFw2@rH z_ZjO}a2#bw4Pyn;TB}04xE-6}=|T|84PGPXlvV_<#mR#w0B^jerAIW)EGVZ>^3u+~fM z2Z{A~aMsd;qtX&BX)iSGSENr52nzdqDG#~L!r|HLSA>EQrNDYrxJZwts5Y#;+3e@Cbr%F#U0-kWVBgD&_Erx8oZ@(ftj zf2zM_n?CuencMR^YczNf=A zx4TI4D`dzhoH5+CGg(mtwzotdy-!=D_nG~(X5g4?ORAZ9vgKbq1_I{-IMgK`NyF53 zS}w)h`jp%c;Opi@FYTIin$F)%%cT?qKN?1wc$gq6yvcL*+Wi$qE29**m+_%yo0`(IOHz1V?kRtqyKu0D zc*g*$(dWya^XYDpj{ej$Qf@VmiMk0z#18@Tm6Km85O6z4Lh?xak#G^g!=yk4dd$b86kBLI1u zkMIclM2svN_?7KD@L$p+YY}0Yg&XBHxZITRiU#RwSxup*TAf`vRD~(rM16jTIjV9` z(iOz2JTJ$$y$BdFoUaT8TySoyszZ$yhFKsq1L_-$vU@Ttj1KW{o_ z!l*tCF}AhYIK*tpaj^Scs^iWq^Y=0CrW`IiS&7M8oW}hpq+m>Gi@B;cnW}Fp#hQvy zr8m1d0vl8=GVfoEnUD>{!{Nts2MewD|Mas-=V)9F@Aa+YPDcU@9W?E44OVQ7zd!B- z%XT=C5PBv5^n*R&K@W`c=5c(lbPRl9YS7^3abXUbi0?5>aU)Nx2Q+VPR9PaIpxoGOL1I5jD}J>oEpyx)5Ati@Nz<<3EY=UjC0STBJvZDs^1f?j0a9rQm;OH zwFP*2`|Cnac`1n0@n_z!(wb*{hv$^fd_p;E>V2r)h$k+?ok-wOS79+&lChAg_&Ue;ij-%<}@Wn15rX zzeHW&Q{w(D)K^^h+J<3tlCQ~3gmCo>%?~}3+B&jgU$)Y8+>uWO~o2lf2OB_q@ zrAa~15e00Fis;DDyC28ngF@6#7e9Ijy$Z_W(o*akSP`;nKRnwH$bL0=cf^cuT)+unL- z74_RJ!CqMtl9@XalDH73p36o$ru$fEV5|Js_aM~8ljRHpe-vc{xSe+I_l*pswlFLa zp;KkDcOG{#J!SsRB&HI188Bu zvYLVtp{JDv5(O7_Tj^Tb%X`O|T4N|x=nC|OPsRCahu)HP00aMPY7JqdWq0N6y2faU zQ2$DSb(u@{{OHsA06^<&7pztKvN3xvzj9=Cm|km4(2VNUOZGacfh9r-U_sVMhu;}w z^WQCiB#!dS>u!r&*I{>S&2CsqgY%{Cl2r56!deGZ9)ZTY7Mf;Y)=nhGR+`|e61(3E zEGw9EfsMSwnH!w4pc`zVp--`SHNJQcKdVZO}N5An1Pz3rrEw zQqLZVFs}v8OfxP{RN8xqao`t7+*BM6M-gyTn+9#JtJj6T*(#bWe&&pp6HEOwpyKFn zm?{}vMUrY`6bxtbraW+;#rK0w6_A1LiE=~Wr?!0KT|4)zF26O>AU-Zgy1bSsH`y^l$D6d< zhYIFScd@AY*4TQ9t4X2L0d(K0H)!(Vk1Ta2wd(E7)BG^q79Qa50yvA%r<`(jSmy!H zH;}VF3nJCPqcAxvWX0(S?xJm`Lo`XS{Obo*Uq@y$#fQu*1?O3qDi)r-E-`J(#W>2CT9iXmMs=Xhq-~!_5Jpn0xp>@;rz*wIaCE!7NPfQFjDbl z-pt}49Quu&OZQhRcgFZ1>z{-H7Cc9V8)$D3vbd$cvamOx_O&fD9byPZCtXPEOqIK7 z@ctN!_xy4ZgV+SRC6oS|JvuO4$PXydw|}$sOm?H~l&8E(1koaZ3g4_O&op>wHRf-8 zH91dM<=2N&{e%Fj7Z~CBU0e*py#4pkhvkE>OuBO&g}v+n8v3I!;MyB=kG5J!yL&k2 zTakms)61M@D<1v=rqu5^8||={0?>CHs|MUu*@9axOrMgM3Rv_!Xf!SMP6#e6g1n7u z)t=z7vsY=5&7!S;8u2%oy2w1oT)H!`s2?nGCC&q(l4->|;khiYAvCqQ8)3h8zYnDFWJC-Qxc{>zxR&t|zGR&wI`PI%IY>yd(s5(iylrBTD zK9+1Z8M@{)0inZk_<0Rpu_F=J=PC(bOO>F_QjJ#Qt)dcLovfPE-@4qC9^}$l-3l+)<2<%-1juHgl3f* zN*I7DMzv0|&NIeb=_Vi-xmpUe(u}+W_VjY|X0h%CKl}8HL>pL69m~e`P3a72s}#9& zyrcfSlrtT0k#8Pshxs9F4RB%z3He^x%VFuUO&K1SQfto-bgmwsY#?7Yg@KKGfeY$U$8vv%o| zsQ(i8Z|PTZT%3-WtHKJM01mTyFspSk$tJ0!zVO>*gmfR$xk>jQC*LagKP@)&ur&{& zSuZ;il;AdoaaJy3PqO_95rjpB*L3pT)vYnCH<|)jec_PB z6xAiC9$o54eP%!AH(x@(tgA;det?bQX75{#trew#SOm!prc$9bbqEzTIu%|;WvgUrPwdSJfB4cB&(P^PZlNxK^=g_b0`wUesOsyaZttF^=wxck$(x=g&a2(Z z!^T3EB$odAdAA2z{p|wEq#qP*src1u!DDLeX=2zXxm12#D-nO%b(yoV&vwxB%#c{Z zgTA1~ZN%5mrD&60)#-*aGlgl6ix;>Zu~x|%4w{GSL4@RGo`iO=y|c6TyHrkjE|3P^ z2}+Ia2hvHJ%d^C4)e~bAFDHw6%6KHTa(#Qip@4e_RH|ZlgfW!JInN6XGkWf3tNFa` zF#Sz_{QUEFr0jZC6lnThQVn5*lMs6syqC4>!PSV?+f9Stx2A5@-Jy6Eadcei*xRIs zb0OJv%Gj{2!u!k&yHkS)lDi*>uNb=CPj9yjQcGkS7}vCyCWbz91w z+x0TbvaD_Dl@pWXB z-nz=moFZLXP4hq<_Kt^rpaWsr*`a7`{Hx0}hdn$8+gJwH~|#L#HsxK%TsI@YeLcG41r}3ih=GfBN>$`+5rfHM)YD=~QiWciMaxeQ9U>m0D`v zJNF$6LsgPH?;Lj&m(^$#QGG~j%d_Ev=hh&ofVcptYU&RhJRtCS#dHsrzdY|7%ZEt@ z>b-s=aD`(*>xW%iVeaq5>y4);^PBWAr$#!r*&UDH^cD6u;xyoSu}Mht2f+om6eA&m z;Zm1TP_{P-*p4~&^PrkAUSG;Jd-RPsJMCE>S-Rmn(je)l;%+N0bz=)=xqpc7A{{t9 zV_oK!=DdK0qDiP#n%`x>0%EIl3+7ApPM#d#{oybJ+Ow|0WL^uXKo_2Y?4y+h%x}J3 z#vM)URiwX4jIG0R7YuA#1zTbi?b zztZZU%WZIJsNK)MsYAq1uQdO=eshu zpUf2GftsapkOckf;-^p_=1i*W;H39L%&sqG+Gm<>2M3Rz4pCUi1v}e%m22H>3_!}k zb-^dj=@d0jm_=2E0FZL-qFXU@v9)$b=~sr&d@IDFtrNtBNPw7xlCidqq#ps|F;zMG zTU{p!X{*g4rZK14kFQ00TT_N>e%= z+pxFGKR9e1Mx8n!diwrqxNzWb5+S$1P}FmyoprmE+OWzKkI=weisKx&y$am@^?5h0 ztgQfUP3Wk6vYNdxf348$vV~5iJ$Jw00v-k&i7&xzFe2*wSsuPPyq#=EX53sjzMY1= zk)fhw3lQTtI2NzKGIsSR41f;dECr7U8L#HhWJPP#OC;oh}7IuBqno@c@61qWZHQ`E0NulI3$1 z;?MYVRp?R=AKzXMlitN!+ER+xX=AZ5iX%5X8O3%txhVc4VSw440dnzj>Nm>Iqih0c zy(wjEmSxh0qBx?Zl+qI=Ux|bAK=Z4z6E+r>wq(ZmxtS-D4<Ym@h?)0slvl0=KRvN6nK)Du5G;KsAQ0ek+g$WIZp=QTQZWebDoKI!4yq6wj-HZg z8JsYu+55e-D5_h)@&s}0eLY*>X749c3*^vO|i2V~K|qPf0vimx%4NX(Q{zFa~2HCs&w z%rf*7yi9)h7Az1qpNaYBp`AUAk2%aZKNtwP)VI zOcXzNxvd--(j~|hL{V6n2w^T+pD#ZDp69Dh_Rle;5!4!Gbx_9Ja5TG_jlOigoa;95 zvkz6&m2G^VkH$}!`J(zMUPBzi_f(hoVQs;pKD2tJ6Nv_g)2~K6UUokGl|k1ez~hnF zigQK=q!M=}2Bs3n2)y%b3oD0MJnlr1kfD^7a_5zuZER^rg@{?|WWZmN zQ6O)~Im9$t(=USl6rDAN`loRx3saUw7Giowj4ijRE`FCtI=_>3zoA~(jdgQMK8im@ zGAL_G@oJ|E)M+7PW-dDr?^$42c93qpBTHTV!{xUhwsNd|?rqIkPS|u2Uv_kT-)oAZ%A4gn9_1N2tu`XbnXPM31O~t&8Evb<=Eywg;|{kRK`_5l6#y33 zdXu6o8o#JikTW1KTr>-R%QWGzJvt?Lmb1Yuq6LU08sMwgdHPU;)SGowA$7v->3^a$ogf{cS1&{T)^M50Y3eE=jM!dApsJ z-Q0q`Nfw06!8r16R@U?-woct9_#G(XF}GHEXm@byr47p| zW#xUfw#=KeU0c1G$6qfhgnpV0F&DF41QjxADEsm5g5{+*n%m#V@`Sp#Pc^9jOvjdT zz8YRuu&NZtHz0ah#_O>PESgC{8$xGBFrdscJ^7DTU~1Q6r1ZyQo@b6l{=BhsdL>_B ztJ57<@};^=7C6wz_@+$%zyTVXf}f9hPc6ng{ALp-2vH8HcmtS0pH_{!qGVn`U0v$h zjI7Is$e2i{tXS|DlRru_8|zLFJ_>&2mm5r$`Ka^#OR(ebZv9o2_9khzFmogI>j<5a zz5?+=>+iBj0~A;$I|*v6U$<@2sq2&Es9^DJja~o{dt?)Lxjd ztxZuMFdaxX=EjD!>1M)J9t!u}*MDi~|7jd=%xf@2{f9)-!(dZPX+zefQ&;#?%#A#} zR3JPitLvl2gCsR_HG`Of`wG9%6dv#2@e*in~f>pt^ed{dWv2+Gn%Ch)M zvvWCu@C^LSz*>_#-49H=a6K6soGkfWhnE^TIk7jC#}SJW>xw-xx2p|?+0_?KKngSO zMp+Eh4X=;Na{=0m&h7WMoWdq!VD*2-BYZ(1(B^pMt@Yv9(p-0CW#!eKogBjunLF}B zv$Gz1Wn=5bEiJPa4PWcsJL5rPlXsG=e{PC}cx-qegD!AzEiz5{OW$ccp0oJm-QB3M zzlVpzzkX>N8xKdY<8Zi38-APP*sp4&=94#yA#@7HmmT?nkDj_WY}Mvk8oSx8k3t|t z4TY!Z+Vb*p_xnwtU}N^o;&t4d zIG4s*QLZfv`&W!v=+3ktAj?XVTv;K!AIsE)X{-vHpGFzK9Zh-3XBhPE?f^N4V4*vau7V^1o=Hp=JgHVPe5f=g=1D27K1S?8{6-*#<%5w4-LmUiN27?{g zuxI}Z;O61r>=^K$0qoiV8W#Z3|2e_O*$v_CW9R1ipD|i6vz!YIK>NP_y)rG^*Z&1- CIkdI_ literal 0 HcmV?d00001 diff --git a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy index fa3e050e61..b75d6bac00 100644 --- a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy +++ b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy @@ -2,16 +2,17 @@ "$GMSprite":"v2", "%Name":"spr_pack_brazier3", "bboxMode":0, - "bbox_bottom":119, - "bbox_left":92, - "bbox_right":188, - "bbox_top":58, + "bbox_bottom":74, + "bbox_left":29, + "bbox_right":135, + "bbox_top":0, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ + {"$GMSpriteFrame":"v1","%Name":"6633717b-8f5b-4785-b3fd-05a0b9b5ad4b","name":"6633717b-8f5b-4785-b3fd-05a0b9b5ad4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -49,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":1.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -64,21 +65,24 @@ "resourceType":"GMSequence", "resourceVersion":"2.0", "seqHeight":322.0, - "seqWidth":281.0, + "seqWidth":164.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":"6633717b-8f5b-4785-b3fd-05a0b9b5ad4b","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bc2a1a59-8f2e-4168-a3b3-8e32bf31cbef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":1.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":57, - "yorigin":81, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, @@ -88,5 +92,5 @@ }, "type":0, "VTile":false, - "width":281, + "width":164, } \ No newline at end of file From 9c4606639cb0d8a2212ae4cdd4a78c9c18efdc64 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Mon, 11 Aug 2025 14:40:54 +0100 Subject: [PATCH 09/13] make a start on angelic theme --- ChapterMaster.yyp | 4 + scripts/scr_ComplexSet/scr_ComplexSet.gml | 16 +++ .../scr_culture_visuals.gml | 55 ++++++++++- .../scr_marine_struct/scr_marine_struct.gml | 26 ++++- .../scr_unit_equip_functions.gml | 26 +++++ .../c5bc43cd-b567-4673-92b9-efede7a0b44f.png | Bin 0 -> 6347 bytes .../0e8b239a-6017-4ba5-8cbe-9353a86768ec.png | Bin 0 -> 6347 bytes .../spr_angelic_wings/spr_angelic_wings.yy | 92 ++++++++++++++++++ .../spr_apothecary_lights.yy | 6 +- .../spr_backpack_fastening.yy | 6 +- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 0 -> 1072 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 0 -> 1072 bytes sprites/spr_binders_belt/spr_binders_belt.yy | 92 ++++++++++++++++++ .../c00a412a-a9bc-45ec-9142-9d8a013a975a.png | Bin 0 -> 9543 bytes .../0b5e7fba-d4a1-441e-a726-f45a72c56663.png | Bin 0 -> 9543 bytes sprites/spr_binders_robe/spr_binders_robe.yy | 92 ++++++++++++++++++ .../spr_binders_robes/spr_binders_robes.yy | 10 +- sprites/spr_blog/spr_blog.yy | 26 +++-- .../spr_cloth_tabbard/spr_cloth_tabbard.yy | 6 +- .../spr_creation_check/spr_creation_check.yy | 18 +++- .../spr_creation_existing.yy | 6 +- .../spr_creation_founding.yy | 6 +- .../380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png | Bin 0 -> 295 bytes .../d07f3659-6442-4004-bcfa-c2f9ad3619bf.png | Bin 0 -> 295 bytes .../spr_creation_other/spr_creation_other.yy | 19 ++-- .../6d4b0fe4-2d29-43cc-9838-317bd93abc41.png | Bin 0 -> 295 bytes .../edca4948-39ec-4e5f-ab97-4d1d7c174675.png | Bin 0 -> 295 bytes .../spr_creation_slate/spr_creation_slate.yy | 19 ++-- .../8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png | Bin 0 -> 1862 bytes .../bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png | Bin 0 -> 442 bytes .../a3482820-22c0-4934-a6c1-87b382d13fad.png | Bin 0 -> 1862 bytes .../7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png | Bin 0 -> 442 bytes .../spr_crux_belt_fancy.yy | 92 ++++++++++++++++++ .../spr_facial_colors/spr_facial_colors.yy | 26 +++-- sprites/spr_gear_halo/spr_gear_halo.yy | 18 +++- .../spr_gear_librarian/spr_gear_librarian.yy | 6 +- .../spr_gear_librarian_term.yy | 6 +- sprites/spr_gear_techa/spr_gear_techa.yy | 6 +- .../spr_indomitus_belt/spr_indomitus_belt.yy | 14 ++- sprites/spr_lion_belt/spr_lion_belt.yy | 6 +- .../spr_marine_cloth_hood.yy | 6 +- .../spr_metal_tabbard/spr_metal_tabbard.yy | 6 +- .../spr_mk7_complex_belt.yy | 14 ++- .../spr_mk7_complex_crux_belt.yy | 6 +- .../spr_mk7_wolf_cult_belt.yy | 6 +- sprites/spr_mongol_hat/spr_mongol_hat.yy | 10 +- .../spr_mongol_topknots.yy | 14 ++- .../spr_planet_splash/spr_planet_splash.yy | 6 +- .../spr_prussian_spike/spr_prussian_spike.yy | 22 ++++- .../spr_servo_harness/spr_servo_harness.yy | 6 +- sprites/spr_settings_bg/spr_settings_bg.yy | 6 +- .../spr_terminator_laurel.yy | 6 +- .../spr_weapon_powspear2.yy | 18 +++- 53 files changed, 748 insertions(+), 77 deletions(-) create mode 100644 sprites/spr_angelic_wings/c5bc43cd-b567-4673-92b9-efede7a0b44f.png create mode 100644 sprites/spr_angelic_wings/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png create mode 100644 sprites/spr_angelic_wings/spr_angelic_wings.yy create mode 100644 sprites/spr_binders_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png create mode 100644 sprites/spr_binders_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png create mode 100644 sprites/spr_binders_belt/spr_binders_belt.yy create mode 100644 sprites/spr_binders_robe/c00a412a-a9bc-45ec-9142-9d8a013a975a.png create mode 100644 sprites/spr_binders_robe/layers/c00a412a-a9bc-45ec-9142-9d8a013a975a/0b5e7fba-d4a1-441e-a726-f45a72c56663.png create mode 100644 sprites/spr_binders_robe/spr_binders_robe.yy create mode 100644 sprites/spr_creation_other/380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png create mode 100644 sprites/spr_creation_other/layers/380cd3fb-d188-44e1-8e61-f3d7c0c8f526/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png create mode 100644 sprites/spr_creation_slate/6d4b0fe4-2d29-43cc-9838-317bd93abc41.png create mode 100644 sprites/spr_creation_slate/layers/6d4b0fe4-2d29-43cc-9838-317bd93abc41/edca4948-39ec-4e5f-ab97-4d1d7c174675.png create mode 100644 sprites/spr_crux_belt_fancy/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png create mode 100644 sprites/spr_crux_belt_fancy/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png create mode 100644 sprites/spr_crux_belt_fancy/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png create mode 100644 sprites/spr_crux_belt_fancy/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png create mode 100644 sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index c0f521d007..d8c4d3685a 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -989,6 +989,7 @@ {"id":{"name":"mk7_chest_variants","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},}, {"id":{"name":"spr_advisors","path":"sprites/spr_advisors/spr_advisors.yy",},}, {"id":{"name":"spr_alpha_backpack","path":"sprites/spr_alpha_backpack/spr_alpha_backpack.yy",},}, + {"id":{"name":"spr_angelic_wings","path":"sprites/spr_angelic_wings/spr_angelic_wings.yy",},}, {"id":{"name":"spr_apoth_area_pad","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},}, {"id":{"name":"spr_apothecary_lights","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},}, {"id":{"name":"spr_aquila_colors","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},}, @@ -1023,6 +1024,8 @@ {"id":{"name":"spr_battle_block","path":"sprites/spr_battle_block/spr_battle_block.yy",},}, {"id":{"name":"spr_battle_block2","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},}, {"id":{"name":"spr_beakie_colors","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},}, + {"id":{"name":"spr_binders_belt","path":"sprites/spr_binders_belt/spr_binders_belt.yy",},}, + {"id":{"name":"spr_binders_robe","path":"sprites/spr_binders_robe/spr_binders_robe.yy",},}, {"id":{"name":"spr_binders_robes","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},}, {"id":{"name":"spr_bio_fighter","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},}, {"id":{"name":"spr_bionic_eye_2","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},}, @@ -1120,6 +1123,7 @@ {"id":{"name":"spr_creation_slate","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},}, {"id":{"name":"spr_credits_bg","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},}, {"id":{"name":"spr_crusader","path":"sprites/spr_crusader/spr_crusader.yy",},}, + {"id":{"name":"spr_crux_belt_fancy","path":"sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy",},}, {"id":{"name":"spr_crux_on_chain","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},}, {"id":{"name":"spr_cthonian_tabbard","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},}, {"id":{"name":"spr_cursor","path":"sprites/spr_cursor/spr_cursor.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index d72f2a0bfc..6fb930cb82 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -306,6 +306,22 @@ function ComplexSet(_unit) constructor { } } } + + if (struct_exists(_mod, "equipment_has_tag")) { + var _viable = false; + var _tag_check_areas = struct_get_names(_mod.equipment_has_tag); + for (var i=0; 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 COi0iG literal 0 HcmV?d00001 diff --git a/sprites/spr_angelic_wings/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png b/sprites/spr_angelic_wings/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png new file mode 100644 index 0000000000000000000000000000000000000000..bbee1b088d02f5d9b0c8cbf0511cf0f4aa99b299 GIT binary patch literal 6347 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 COi0iG literal 0 HcmV?d00001 diff --git a/sprites/spr_angelic_wings/spr_angelic_wings.yy b/sprites/spr_angelic_wings/spr_angelic_wings.yy new file mode 100644 index 0000000000..e2958b6086 --- /dev/null +++ b/sprites/spr_angelic_wings/spr_angelic_wings.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_angelic_wings", + "bboxMode":0, + "bbox_bottom":203, + "bbox_left":8, + "bbox_right":158, + "bbox_top":37, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0e8b239a-6017-4ba5-8cbe-9353a86768ec","blendMode":0,"displayName":"default","isLocked":false,"name":"0e8b239a-6017-4ba5-8cbe-9353a86768ec","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_angelic_wings", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"packs", + "path":"folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_angelic_wings", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_angelic_wings", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.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":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_angelic_wings/spr_angelic_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ee2f8787-456f-461c-b7c9-774ea1070012","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, + "volume":1.0, + "xorigin":0, + "yorigin":45, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy index f8b03691d8..2673d9502b 100644 --- a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy +++ b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b54351d-f020-400d-99c5-b24a753b7623","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5b54351d-f020-400d-99c5-b24a753b7623","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/spr_backpack_fastening/spr_backpack_fastening.yy b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy index 39e0c962cb..a3f0db958b 100644 --- a/sprites/spr_backpack_fastening/spr_backpack_fastening.yy +++ b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/spr_backpack_fastening/spr_backpack_fastening.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13043471-e077-4f56-9ff2-cd603f68f0f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/spr_backpack_fastening/spr_backpack_fastening.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"13043471-e077-4f56-9ff2-cd603f68f0f5","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/spr_binders_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_binders_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000000000000000000000000000000000..eb713baadf24dda40bfe749de3ffb984ef54c27e GIT binary patch literal 1072 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^+0(@_q~g}wJ7)uL zJ4moS@Si#5f%Nkbp;d`$tObb@dLj?XJd}4H*0jyx`*(TWlBp>N)GmECICLWF?~lu; z*X8sm15G6vOk1||8{?nnL8&uu&2zkXZt|wtalX&lk7-`BnW|tm_4j9aiDe#_eO?G2 z=XfU4WvtiBx-oOAVQ@g#@H;MB!^`S(VPD(F+O&3~t>H1N z@~_)9aL=5*#-H!;#|g{cJ=x6v?DUVix6C^hMDZ7&6^?tiTQYKAM)$ja--B-DEdKdB z`$ggM=gX((wEk|NFK)f#`SSZm_vPO{Ue5FQ@jq>`x^vfzQrvIlDCcfFe)HOto9s!8 zmKpgPZ`l8M`J||IGXnjk${^sUwckN9s)=v${vv+m5=e%|Fsg_a+9#`u!^?i7W- zt@d}P$7`+InQkL+qVIA*&5N_oV#E2gw{O3Fev$Q_o7Vz*C7r*$GyP&S;cfQ5JuzRi zPZ%BfS+?u*L=&zVOdb z&N?_GPV~Y5$yt{bCroTj7hmx(;3=cc7Tx!&*WQkm3tsLT?fiZI+#|DR&#tJgoqJ)6 zS;_O${JE!o-m+4j&YW$b-?M^eZDxYi*OsTbxpVhDEiW(ce*bsb2c6$bUj8@!bP0l+XkKvpBQC literal 0 HcmV?d00001 diff --git a/sprites/spr_binders_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_binders_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000000000000000000000000000000000..eb713baadf24dda40bfe749de3ffb984ef54c27e GIT binary patch literal 1072 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^+0(@_q~g}wJ7)uL zJ4moS@Si#5f%Nkbp;d`$tObb@dLj?XJd}4H*0jyx`*(TWlBp>N)GmECICLWF?~lu; z*X8sm15G6vOk1||8{?nnL8&uu&2zkXZt|wtalX&lk7-`BnW|tm_4j9aiDe#_eO?G2 z=XfU4WvtiBx-oOAVQ@g#@H;MB!^`S(VPD(F+O&3~t>H1N z@~_)9aL=5*#-H!;#|g{cJ=x6v?DUVix6C^hMDZ7&6^?tiTQYKAM)$ja--B-DEdKdB z`$ggM=gX((wEk|NFK)f#`SSZm_vPO{Ue5FQ@jq>`x^vfzQrvIlDCcfFe)HOto9s!8 zmKpgPZ`l8M`J||IGXnjk${^sUwckN9s)=v${vv+m5=e%|Fsg_a+9#`u!^?i7W- zt@d}P$7`+InQkL+qVIA*&5N_oV#E2gw{O3Fev$Q_o7Vz*C7r*$GyP&S;cfQ5JuzRi zPZ%BfS+?u*L=&zVOdb z&N?_GPV~Y5$yt{bCroTj7hmx(;3=cc7Tx!&*WQkm3tsLT?fiZI+#|DR&#tJgoqJ)6 zS;_O${JE!o-m+4j&YW$b-?M^eZDxYi*OsTbxpVhDEiW(ce*bsb2c6$bUj8@!bP0l+XkKvpBQC literal 0 HcmV?d00001 diff --git a/sprites/spr_binders_belt/spr_binders_belt.yy b/sprites/spr_binders_belt/spr_binders_belt.yy new file mode 100644 index 0000000000..418b7a9bf0 --- /dev/null +++ b/sprites/spr_binders_belt/spr_binders_belt.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_binders_belt", + "bboxMode":0, + "bbox_bottom":114, + "bbox_left":56, + "bbox_right":107, + "bbox_top":82, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_binders_belt", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"mk_7_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_binders_belt", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_binders_belt", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_binders_belt/spr_binders_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"68badb9c-da79-4a80-b8c4-f9962a02da21","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, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_binders_robe/c00a412a-a9bc-45ec-9142-9d8a013a975a.png b/sprites/spr_binders_robe/c00a412a-a9bc-45ec-9142-9d8a013a975a.png new file mode 100644 index 0000000000000000000000000000000000000000..8d854d697f36b5615d3dd17fa3d4a70d10985342 GIT binary patch literal 9543 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 Mm9>;A72XE^FY5!++5i9m literal 0 HcmV?d00001 diff --git a/sprites/spr_binders_robe/layers/c00a412a-a9bc-45ec-9142-9d8a013a975a/0b5e7fba-d4a1-441e-a726-f45a72c56663.png b/sprites/spr_binders_robe/layers/c00a412a-a9bc-45ec-9142-9d8a013a975a/0b5e7fba-d4a1-441e-a726-f45a72c56663.png new file mode 100644 index 0000000000000000000000000000000000000000..8d854d697f36b5615d3dd17fa3d4a70d10985342 GIT binary patch literal 9543 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 Mm9>;A72XE^FY5!++5i9m literal 0 HcmV?d00001 diff --git a/sprites/spr_binders_robe/spr_binders_robe.yy b/sprites/spr_binders_robe/spr_binders_robe.yy new file mode 100644 index 0000000000..e67a6a359f --- /dev/null +++ b/sprites/spr_binders_robe/spr_binders_robe.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_binders_robe", + "bboxMode":0, + "bbox_bottom":203, + "bbox_left":49, + "bbox_right":116, + "bbox_top":44, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0b5e7fba-d4a1-441e-a726-f45a72c56663","blendMode":0,"displayName":"default","isLocked":false,"name":"0b5e7fba-d4a1-441e-a726-f45a72c56663","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_binders_robe", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_binders_robe", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_binders_robe", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"c00a412a-a9bc-45ec-9142-9d8a013a975a","path":"sprites/spr_binders_robe/spr_binders_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3cdc5249-b43e-47ef-9b3e-594c53429273","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, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_binders_robes/spr_binders_robes.yy b/sprites/spr_binders_robes/spr_binders_robes.yy index 6ba17f71bf..2ad79d3a66 100644 --- a/sprites/spr_binders_robes/spr_binders_robes.yy +++ b/sprites/spr_binders_robes/spr_binders_robes.yy @@ -64,13 +64,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"215363f4-8f45-4eca-ae3c-019fa514b47f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daf40e8e-0ab7-400e-bd4c-e52e8f404d3d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"215363f4-8f45-4eca-ae3c-019fa514b47f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"daf40e8e-0ab7-400e-bd4c-e52e8f404d3d","IsCreationKey":false,"Key":1.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/spr_blog/spr_blog.yy b/sprites/spr_blog/spr_blog.yy index 3551bd7584..dda850d0cb 100644 --- a/sprites/spr_blog/spr_blog.yy +++ b/sprites/spr_blog/spr_blog.yy @@ -68,17 +68,31 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":31.0, + "seqWidth":80.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":"c21a34a6-d266-489b-b6a0-0c679cf27c53","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40cf980a-c533-4a0f-8ff5-f24cfcfb77ad","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"535cb6f7-000e-4721-b110-366ed91586fd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c75c05d9-2ab6-451f-b4ba-17a06bacd03c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fecfc36-bb6d-4b7d-9923-5b749b1d36c4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82c9e0e1-20b5-4047-9966-b43b76e593f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"355f3481-2d74-4cce-932d-dc10af3c877b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"108fb78c-f692-4d04-9238-2f4fa17f5a1e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40cf980a-c533-4a0f-8ff5-f24cfcfb77ad","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"535cb6f7-000e-4721-b110-366ed91586fd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c75c05d9-2ab6-451f-b4ba-17a06bacd03c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1fecfc36-bb6d-4b7d-9923-5b749b1d36c4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"82c9e0e1-20b5-4047-9966-b43b76e593f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"355f3481-2d74-4cce-932d-dc10af3c877b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","path":"sprites/spr_blog/spr_blog.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"108fb78c-f692-4d04-9238-2f4fa17f5a1e","IsCreationKey":false,"Key":5.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/spr_cloth_tabbard/spr_cloth_tabbard.yy b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy index 9c2ac9ea49..b7dcac5ebf 100644 --- a/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy +++ b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":181.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":"a4969c4d-bb32-4b93-8aed-93bd969a4101","path":"sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6fbee2e3-91de-475d-8177-2f0f57e55b84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","path":"sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6fbee2e3-91de-475d-8177-2f0f57e55b84","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/spr_creation_check/spr_creation_check.yy b/sprites/spr_creation_check/spr_creation_check.yy index 2440c8b801..be967ad76d 100644 --- a/sprites/spr_creation_check/spr_creation_check.yy +++ b/sprites/spr_creation_check/spr_creation_check.yy @@ -66,15 +66,25 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.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":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4e462ad-1f0a-4b83-a287-77a37a746b99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23faa1-9d33-420c-abee-14a54a948dbf","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd6d5659-448d-46f4-9338-1ce1f10a8664","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c38f65bc-11d7-4bd6-ac49-4cc4ca363472","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"254f0303-cebd-476e-b05b-d23837a0eb42","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abe0f3dc-6d7f-4162-a9fa-febc8f647d0b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a4e462ad-1f0a-4b83-a287-77a37a746b99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c23faa1-9d33-420c-abee-14a54a948dbf","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd6d5659-448d-46f4-9338-1ce1f10a8664","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c38f65bc-11d7-4bd6-ac49-4cc4ca363472","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"254f0303-cebd-476e-b05b-d23837a0eb42","path":"sprites/spr_creation_check/spr_creation_check.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"abe0f3dc-6d7f-4162-a9fa-febc8f647d0b","IsCreationKey":false,"Key":3.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/spr_creation_existing/spr_creation_existing.yy b/sprites/spr_creation_existing/spr_creation_existing.yy index 46c72559b7..7fb651473a 100644 --- a/sprites/spr_creation_existing/spr_creation_existing.yy +++ b/sprites/spr_creation_existing/spr_creation_existing.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.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":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","path":"sprites/spr_creation_existing/spr_creation_existing.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27183917-bca7-4f08-bc34-9aabdb49048e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","path":"sprites/spr_creation_existing/spr_creation_existing.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"27183917-bca7-4f08-bc34-9aabdb49048e","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/spr_creation_founding/spr_creation_founding.yy b/sprites/spr_creation_founding/spr_creation_founding.yy index 40e9498613..dce7c3976c 100644 --- a/sprites/spr_creation_founding/spr_creation_founding.yy +++ b/sprites/spr_creation_founding/spr_creation_founding.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.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":"469027c1-a05e-49c8-975f-f88b2b836a4c","path":"sprites/spr_creation_founding/spr_creation_founding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db39a3f1-b108-4f5d-888b-a2ffdeff59bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"469027c1-a05e-49c8-975f-f88b2b836a4c","path":"sprites/spr_creation_founding/spr_creation_founding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"db39a3f1-b108-4f5d-888b-a2ffdeff59bc","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/spr_creation_other/380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png b/sprites/spr_creation_other/380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png new file mode 100644 index 0000000000000000000000000000000000000000..0e27e2d795fa51d6e71ddb9119c3cc1254efc3cc GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-VZ8DeB$Wom3? zWU6goU}a$N<4$EfiiX_$l+3hB+!{I?4?YHJ(16=el9`)YT#}eufLqVKDGxxtVeoYI Kb6Mw<&;$T(^-qle literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_other/layers/380cd3fb-d188-44e1-8e61-f3d7c0c8f526/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png b/sprites/spr_creation_other/layers/380cd3fb-d188-44e1-8e61-f3d7c0c8f526/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png new file mode 100644 index 0000000000000000000000000000000000000000..0e27e2d795fa51d6e71ddb9119c3cc1254efc3cc GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-VZ8DeB$Wom3? zWU6goU}a$N<4$EfiiX_$l+3hB+!{I?4?YHJ(16=el9`)YT#}eufLqVKDGxxtVeoYI Kb6Mw<&;$T(^-qle literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_other/spr_creation_other.yy b/sprites/spr_creation_other/spr_creation_other.yy index 209bbc7828..5ef35ea548 100644 --- a/sprites/spr_creation_other/spr_creation_other.yy +++ b/sprites/spr_creation_other/spr_creation_other.yy @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"380cd3fb-d188-44e1-8e61-f3d7c0c8f526","name":"380cd3fb-d188-44e1-8e61-f3d7c0c8f526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], "gridX":0, "gridY":0, "height":32, @@ -47,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":0.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -61,16 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"380cd3fb-d188-44e1-8e61-f3d7c0c8f526","path":"sprites/spr_creation_other/spr_creation_other.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"34ff5991-1f2a-4119-96ef-8708bf533169","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":0, "yorigin":0, diff --git a/sprites/spr_creation_slate/6d4b0fe4-2d29-43cc-9838-317bd93abc41.png b/sprites/spr_creation_slate/6d4b0fe4-2d29-43cc-9838-317bd93abc41.png new file mode 100644 index 0000000000000000000000000000000000000000..0e27e2d795fa51d6e71ddb9119c3cc1254efc3cc GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-VZ8DeB$Wom3? zWU6goU}a$N<4$EfiiX_$l+3hB+!{I?4?YHJ(16=el9`)YT#}eufLqVKDGxxtVeoYI Kb6Mw<&;$T(^-qle literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_slate/layers/6d4b0fe4-2d29-43cc-9838-317bd93abc41/edca4948-39ec-4e5f-ab97-4d1d7c174675.png b/sprites/spr_creation_slate/layers/6d4b0fe4-2d29-43cc-9838-317bd93abc41/edca4948-39ec-4e5f-ab97-4d1d7c174675.png new file mode 100644 index 0000000000000000000000000000000000000000..0e27e2d795fa51d6e71ddb9119c3cc1254efc3cc GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=k0Y$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e464!{5l*E!$tK_0oAjM#0U}UOmV4-VZ8DeB$Wom3? zWU6goU}a$N<4$EfiiX_$l+3hB+!{I?4?YHJ(16=el9`)YT#}eufLqVKDGxxtVeoYI Kb6Mw<&;$T(^-qle literal 0 HcmV?d00001 diff --git a/sprites/spr_creation_slate/spr_creation_slate.yy b/sprites/spr_creation_slate/spr_creation_slate.yy index 1de0a3fe68..a2ea85d73b 100644 --- a/sprites/spr_creation_slate/spr_creation_slate.yy +++ b/sprites/spr_creation_slate/spr_creation_slate.yy @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"6d4b0fe4-2d29-43cc-9838-317bd93abc41","name":"6d4b0fe4-2d29-43cc-9838-317bd93abc41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], "gridX":0, "gridY":0, "height":32, @@ -47,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":0.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -61,16 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d4b0fe4-2d29-43cc-9838-317bd93abc41","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"64935b0e-41d4-4c0f-9837-488dd1953f08","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":0, "yorigin":0, diff --git a/sprites/spr_crux_belt_fancy/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png b/sprites/spr_crux_belt_fancy/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc56a02756273eb07c703d33179707cce164bfa GIT binary patch literal 1862 zcmb`Hc{JN;7sr1yC{r~~TWL#BGgVtl@`^H2m0D6HuV4DcR%sj3CI}5mgvQdv)*2lp zR3%hf3ErttdrK{)Wo9f9iW0OPf?BE?vBff(f99N-bLO1+W1i^hai?btMu0`@Ut+GRIQw}V7$VKm>Gu{;dm<9lFEdc=5<)LfS01yEOfEix^ zK;8p@{h_&a|Fe-Nc3i+ZIRe|i-vA%?$N1}MR>}Mom5Gh^Su|iA z%L}s6mZ~cJwdNoB%~5O)Cmex5fcUbnMDK2|D{bItN&?riOI;zFx1u|+6jHF zOHm*u$$Wy=S)^cWyc<6ptzt3oF3dp_Y%yMXpO0RcB};3RY-qtzx6ekf7b-^ zK|0juRTWjAN=~X8~)x5A%^8 z76~?$*Ihv)vNKsU|LsPyIL5kqj-MLQ<|Ut+G1L$|q7u)U9y{)I zo%B-+=1stvo|f^hTeryKT?)ei`n9Sndr@_%kyD#DyfS?;N;``IW zIzqRDLT&#V%0n?VZuhjl=;_X@aebCM68yNO4b&E^GcvLe=ZKlt_8H{j7eu4nIkP4W z)dGEftbf|=q@_LqgAx#k8E(Q2H+j{`vgs>0YIt9%Ms<8Z{RuZ=9LCykF=fwlyVTh4 z-lEnDWf!EP()85_n8VQXUXLva+nef8{?&JegY|SGyTrL^!z6G0X*8;`lF?sGsNT%N z;Fec3jGv?HOw!l-Q}{{K?p-CE69b;}8x!*pREBVJ5XAPs(Q)bUe>9~!^=N8QI)i1P zKWr&bC&`gLOr1!-PN-}pclOD!r)f0 zM;(D>w%*&Cyxei4dwL|hYzXZW^jP>z@N}u13?^#JPPQyv;@9`%uM=eYf3-Yc ziV?jp92lZ=#K`;j)s;dctGK0cUQtQ9Y|&cv9+||44N0P*_=|4Lk&54XRPWhE082{~}LsE5R2(`rJR$H&U^2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#GEii#r;B4q#jUpo4H<#F zLkqt8=koF|05S(5s4$63V_!C8<`)MX5lF!N|bKMAyJr*U%)y zz|_jv!pg`{+rYrez~J(h+zluia`RI%(<*UmSoHEL4^V>!+=i0O+|=Td#M}bhdcOYo Qav2n4p00i_>zopr0Cinc8~^|S literal 0 HcmV?d00001 diff --git a/sprites/spr_crux_belt_fancy/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_crux_belt_fancy/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc56a02756273eb07c703d33179707cce164bfa GIT binary patch literal 1862 zcmb`Hc{JN;7sr1yC{r~~TWL#BGgVtl@`^H2m0D6HuV4DcR%sj3CI}5mgvQdv)*2lp zR3%hf3ErttdrK{)Wo9f9iW0OPf?BE?vBff(f99N-bLO1+W1i^hai?btMu0`@Ut+GRIQw}V7$VKm>Gu{;dm<9lFEdc=5<)LfS01yEOfEix^ zK;8p@{h_&a|Fe-Nc3i+ZIRe|i-vA%?$N1}MR>}Mom5Gh^Su|iA z%L}s6mZ~cJwdNoB%~5O)Cmex5fcUbnMDK2|D{bItN&?riOI;zFx1u|+6jHF zOHm*u$$Wy=S)^cWyc<6ptzt3oF3dp_Y%yMXpO0RcB};3RY-qtzx6ekf7b-^ zK|0juRTWjAN=~X8~)x5A%^8 z76~?$*Ihv)vNKsU|LsPyIL5kqj-MLQ<|Ut+G1L$|q7u)U9y{)I zo%B-+=1stvo|f^hTeryKT?)ei`n9Sndr@_%kyD#DyfS?;N;``IW zIzqRDLT&#V%0n?VZuhjl=;_X@aebCM68yNO4b&E^GcvLe=ZKlt_8H{j7eu4nIkP4W z)dGEftbf|=q@_LqgAx#k8E(Q2H+j{`vgs>0YIt9%Ms<8Z{RuZ=9LCykF=fwlyVTh4 z-lEnDWf!EP()85_n8VQXUXLva+nef8{?&JegY|SGyTrL^!z6G0X*8;`lF?sGsNT%N z;Fec3jGv?HOw!l-Q}{{K?p-CE69b;}8x!*pREBVJ5XAPs(Q)bUe>9~!^=N8QI)i1P zKWr&bC&`gLOr1!-PN-}pclOD!r)f0 zM;(D>w%*&Cyxei4dwL|hYzXZW^jP>z@N}u13?^#JPPQyv;@9`%uM=eYf3-Yc ziV?jp92lZ=#K`;j)s;dctGK0cUQtQ9Y|&cv9+||44N0P*_=|4Lk&54XRPWhE082{~}LsE5R2(`rJR$H&U^2OE&=lK2t|q!f}pf_xbms?-=58d?|_egTCV zUNA6}8Za=tN?>5Hn!&&zUNC1@pbb!hEy>&6h2cL4F4((#GEii#r;B4q#jUpo4H<#F zLkqt8=koF|05S(5s4$63V_!C8<`)MX5lF!N|bKMAyJr*U%)y zz|_jv!pg`{+rYrez~J(h+zluia`RI%(<*UmSoHEL4^V>!+=i0O+|=Td#M}bhdcOYo Qav2n4p00i_>zopr0Cinc8~^|S literal 0 HcmV?d00001 diff --git a/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy b/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy new file mode 100644 index 0000000000..402e7fe6a8 --- /dev/null +++ b/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_crux_belt_fancy", + "bboxMode":0, + "bbox_bottom":110, + "bbox_left":3, + "bbox_right":109, + "bbox_top":21, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a3482820-22c0-4934-a6c1-87b382d13fad","blendMode":0,"displayName":"default","isLocked":false,"name":"a3482820-22c0-4934-a6c1-87b382d13fad","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_crux_belt_fancy", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"specialist", + "path":"folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_crux_belt_fancy", + "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":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_crux_belt_fancy", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9b724e95-f10f-4ea0-888a-549bb453f7be","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, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_facial_colors/spr_facial_colors.yy b/sprites/spr_facial_colors/spr_facial_colors.yy index fe7f7fcdda..c9c16e19f5 100644 --- a/sprites/spr_facial_colors/spr_facial_colors.yy +++ b/sprites/spr_facial_colors/spr_facial_colors.yy @@ -68,17 +68,31 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"64f02c8a-c899-45df-b03c-b6a1394a32bc","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e46075c-708a-4a1d-b8d4-94a3ae893431","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2fd1690-ad2e-4dea-913f-7440f3207956","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84706981-bf4b-4af8-aeaa-d3eb9231d9a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03ab84fc-5ffb-4f14-9645-5c41504d8243","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65faf790-8c1e-4d39-9557-951e2d4830ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d567fc9-e5a0-444d-91ee-e3c5f7137ced","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a0af901-a520-42bd-b1ac-947b53d45c39","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eec80b21-96a4-43c1-8943-e7cad91b86ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0e46075c-708a-4a1d-b8d4-94a3ae893431","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2fd1690-ad2e-4dea-913f-7440f3207956","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84706981-bf4b-4af8-aeaa-d3eb9231d9a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"03ab84fc-5ffb-4f14-9645-5c41504d8243","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"65faf790-8c1e-4d39-9557-951e2d4830ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1d567fc9-e5a0-444d-91ee-e3c5f7137ced","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a0af901-a520-42bd-b1ac-947b53d45c39","path":"sprites/spr_facial_colors/spr_facial_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eec80b21-96a4-43c1-8943-e7cad91b86ae","IsCreationKey":false,"Key":5.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/spr_gear_halo/spr_gear_halo.yy b/sprites/spr_gear_halo/spr_gear_halo.yy index 8818006a8d..cba13d749c 100644 --- a/sprites/spr_gear_halo/spr_gear_halo.yy +++ b/sprites/spr_gear_halo/spr_gear_halo.yy @@ -66,15 +66,25 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.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":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00e9af48-289d-43b0-9f62-a44e7132afc0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f8705cc-25c0-45f8-b522-813a85727411","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c17d17d-bf4c-4925-9341-17adaaf3e468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bdb51d63-77df-4a88-a08d-18528e64e17e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33022205-50ff-4396-96a1-1f77edceb66f","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88a68e4e-7ef5-4524-b12f-918792556dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"00e9af48-289d-43b0-9f62-a44e7132afc0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f8705cc-25c0-45f8-b522-813a85727411","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1c17d17d-bf4c-4925-9341-17adaaf3e468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bdb51d63-77df-4a88-a08d-18528e64e17e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33022205-50ff-4396-96a1-1f77edceb66f","path":"sprites/spr_gear_halo/spr_gear_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"88a68e4e-7ef5-4524-b12f-918792556dff","IsCreationKey":false,"Key":3.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/spr_gear_librarian/spr_gear_librarian.yy b/sprites/spr_gear_librarian/spr_gear_librarian.yy index f0bc7a6f3f..4fcb1d980d 100644 --- a/sprites/spr_gear_librarian/spr_gear_librarian.yy +++ b/sprites/spr_gear_librarian/spr_gear_librarian.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77965c26-dffa-4b7c-baec-050b652956e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian/spr_gear_librarian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"77965c26-dffa-4b7c-baec-050b652956e2","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/spr_gear_librarian_term/spr_gear_librarian_term.yy b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy index 51742ec2db..cf11ee9c38 100644 --- a/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy +++ b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"667c99aa-306d-4da1-a87a-14e37704f784","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"667c99aa-306d-4da1-a87a-14e37704f784","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/spr_gear_techa/spr_gear_techa.yy b/sprites/spr_gear_techa/spr_gear_techa.yy index 5e8d4140cd..61ab2c9089 100644 --- a/sprites/spr_gear_techa/spr_gear_techa.yy +++ b/sprites/spr_gear_techa/spr_gear_techa.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_techa/spr_gear_techa.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef2b2955-191c-4da1-a891-355c842c33b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_gear_techa/spr_gear_techa.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ef2b2955-191c-4da1-a891-355c842c33b1","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/spr_indomitus_belt/spr_indomitus_belt.yy b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy index b5f5831402..aa9efbc748 100644 --- a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy +++ b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy @@ -65,14 +65,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ad9035b-9bda-4936-9f2e-2ce26793a018","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"379a95d4-e686-4cd0-bae4-d6538fe00566","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f184b9f-eef4-4a86-a538-61303e8cf300","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36d12149-c9ad-4f8b-9e33-e79eea03b9a1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0ad9035b-9bda-4936-9f2e-2ce26793a018","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"379a95d4-e686-4cd0-bae4-d6538fe00566","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4f184b9f-eef4-4a86-a538-61303e8cf300","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"36d12149-c9ad-4f8b-9e33-e79eea03b9a1","IsCreationKey":false,"Key":2.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/spr_lion_belt/spr_lion_belt.yy b/sprites/spr_lion_belt/spr_lion_belt.yy index 104e0121f5..b8c83e5610 100644 --- a/sprites/spr_lion_belt/spr_lion_belt.yy +++ b/sprites/spr_lion_belt/spr_lion_belt.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83a8fffe-2541-46cc-9cd5-08e04842f492","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_lion_belt/spr_lion_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"83a8fffe-2541-46cc-9cd5-08e04842f492","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/spr_marine_cloth_hood/spr_marine_cloth_hood.yy b/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy index 437d1ac2a5..49771bdcb5 100644 --- a/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy +++ b/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","path":"sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bde58bd2-638c-4eb2-a908-97a4fde54b39","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","path":"sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bde58bd2-638c-4eb2-a908-97a4fde54b39","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/spr_metal_tabbard/spr_metal_tabbard.yy b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy index 804fa35cf6..c1021f605c 100644 --- a/sprites/spr_metal_tabbard/spr_metal_tabbard.yy +++ b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"181eb698-17b4-48e0-bf60-e786cc8baaa7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"181eb698-17b4-48e0-bf60-e786cc8baaa7","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/spr_mk7_complex_belt/spr_mk7_complex_belt.yy b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy index f7e43de452..fec5493330 100644 --- a/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy +++ b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy @@ -65,14 +65,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9682d976-cfa5-495a-b8f6-5be5477a1db6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9d12c3e7-cfb3-4825-b44b-5227c2503b2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"163be470-f687-42e2-b07c-ad2291c828fa","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cb55ce9-9436-4e2c-9d6b-4a81a672efc0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9682d976-cfa5-495a-b8f6-5be5477a1db6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9d12c3e7-cfb3-4825-b44b-5227c2503b2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"163be470-f687-42e2-b07c-ad2291c828fa","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3cb55ce9-9436-4e2c-9d6b-4a81a672efc0","IsCreationKey":false,"Key":2.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/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy index 58d29a6ecb..b8d9373899 100644 --- a/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy +++ b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8516e89a-68d9-460b-8288-a2e0c1a172f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8516e89a-68d9-460b-8288-a2e0c1a172f2","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/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy b/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy index a95a560535..4808408ebf 100644 --- a/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy +++ b/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy @@ -65,12 +65,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4dd3a544-ca29-4553-b7c4-e80f13fc8817","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4dd3a544-ca29-4553-b7c4-e80f13fc8817","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/spr_mongol_hat/spr_mongol_hat.yy b/sprites/spr_mongol_hat/spr_mongol_hat.yy index 324d768d63..6c28c71872 100644 --- a/sprites/spr_mongol_hat/spr_mongol_hat.yy +++ b/sprites/spr_mongol_hat/spr_mongol_hat.yy @@ -64,13 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.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":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76c12ca8-2264-465a-adde-c808846b3898","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a992ca08-8ceb-4c3f-9f58-d09a22923b59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"76c12ca8-2264-465a-adde-c808846b3898","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","path":"sprites/spr_mongol_hat/spr_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a992ca08-8ceb-4c3f-9f58-d09a22923b59","IsCreationKey":false,"Key":1.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/spr_mongol_topknots/spr_mongol_topknots.yy b/sprites/spr_mongol_topknots/spr_mongol_topknots.yy index 979312ed4e..d6abf58818 100644 --- a/sprites/spr_mongol_topknots/spr_mongol_topknots.yy +++ b/sprites/spr_mongol_topknots/spr_mongol_topknots.yy @@ -65,14 +65,22 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.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":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5866fa80-598f-4ae8-8d66-084c1cdd183e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea659019-df79-4bf1-ae2f-14074bff361b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf9cefb6-3a88-481c-ab5a-bb6cb1fd5de9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5866fa80-598f-4ae8-8d66-084c1cdd183e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ea659019-df79-4bf1-ae2f-14074bff361b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","path":"sprites/spr_mongol_topknots/spr_mongol_topknots.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bf9cefb6-3a88-481c-ab5a-bb6cb1fd5de9","IsCreationKey":false,"Key":2.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/spr_planet_splash/spr_planet_splash.yy b/sprites/spr_planet_splash/spr_planet_splash.yy index be9af08d9d..4b73d5ec93 100644 --- a/sprites/spr_planet_splash/spr_planet_splash.yy +++ b/sprites/spr_planet_splash/spr_planet_splash.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":128.0, + "seqWidth":128.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":"2c9150bc-4398-4602-912c-ca4949edb320","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ee5d7ca-42fa-4a31-a7f1-15a186131545","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c9150bc-4398-4602-912c-ca4949edb320","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ee5d7ca-42fa-4a31-a7f1-15a186131545","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/spr_prussian_spike/spr_prussian_spike.yy b/sprites/spr_prussian_spike/spr_prussian_spike.yy index 984217b8c2..d2bb270df6 100644 --- a/sprites/spr_prussian_spike/spr_prussian_spike.yy +++ b/sprites/spr_prussian_spike/spr_prussian_spike.yy @@ -67,16 +67,28 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.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":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7710b0d4-f532-4e1b-9547-19ebdc6eba63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6cd9f835-bb5b-4f5a-ac74-9bba33318a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae929a5-f374-473f-a6d0-cf192764bb7e","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2a07b9a-97cc-468f-8185-eed5040dcffe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d774d0a5-b13e-404b-be5a-1c394506d7c7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b2950d-a703-41a5-9fda-cf6e20097872","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d2053dfa-4aca-4c73-b641-8710602b8f93","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7710b0d4-f532-4e1b-9547-19ebdc6eba63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6cd9f835-bb5b-4f5a-ac74-9bba33318a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae929a5-f374-473f-a6d0-cf192764bb7e","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c2a07b9a-97cc-468f-8185-eed5040dcffe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d774d0a5-b13e-404b-be5a-1c394506d7c7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b2950d-a703-41a5-9fda-cf6e20097872","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d2053dfa-4aca-4c73-b641-8710602b8f93","IsCreationKey":false,"Key":4.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/spr_servo_harness/spr_servo_harness.yy b/sprites/spr_servo_harness/spr_servo_harness.yy index 719d822d87..9ffcd2346b 100644 --- a/sprites/spr_servo_harness/spr_servo_harness.yy +++ b/sprites/spr_servo_harness/spr_servo_harness.yy @@ -64,12 +64,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":281.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":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd3a1e77-d409-44b9-b38b-b4a745e9b089","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fd3a1e77-d409-44b9-b38b-b4a745e9b089","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/spr_settings_bg/spr_settings_bg.yy b/sprites/spr_settings_bg/spr_settings_bg.yy index 48dca5d6f9..1c9163d938 100644 --- a/sprites/spr_settings_bg/spr_settings_bg.yy +++ b/sprites/spr_settings_bg/spr_settings_bg.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":900.0, + "seqWidth":1600.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":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcfb2445-3d42-4b16-8d19-767110267766","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fcfb2445-3d42-4b16-8d19-767110267766","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/spr_terminator_laurel/spr_terminator_laurel.yy b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy index d6d59991e4..85710db900 100644 --- a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy +++ b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.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":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_terminator_laurel/spr_terminator_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84173a53-3c37-4c03-b242-f4e857a650c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_terminator_laurel/spr_terminator_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84173a53-3c37-4c03-b242-f4e857a650c7","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/spr_weapon_powspear2/spr_weapon_powspear2.yy b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy index 6e0a9a9fd5..390a3b2995 100644 --- a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy +++ b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy @@ -68,15 +68,25 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":167.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":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c41219a2-cc77-4318-ae9d-736be346d285","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3b5421b-700a-4ffd-84cc-867d26deb4e8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"278bbb1d-7f3b-4087-95e6-ce6a630531e2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"152b7978-2299-46a9-8659-9d3fa7ea8162","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dabce5f0-7a0a-42d9-97ef-29030be272ec","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c41219a2-cc77-4318-ae9d-736be346d285","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f3b5421b-700a-4ffd-84cc-867d26deb4e8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"278bbb1d-7f3b-4087-95e6-ce6a630531e2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"152b7978-2299-46a9-8659-9d3fa7ea8162","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dabce5f0-7a0a-42d9-97ef-29030be272ec","IsCreationKey":false,"Key":3.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, From 0616fc0a54b1e89b4515da85aa82d8d4e01fa1c7 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 14 Aug 2025 00:12:10 +0100 Subject: [PATCH 10/13] Update scripts/scr_weapon/scr_weapon.gml Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- scripts/scr_weapon/scr_weapon.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 33479c14af..589dd49a6c 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -2315,7 +2315,7 @@ global.gear = { "maintenance" : 1, }, "Contemptor Dreadnought": { - "abbreviation": "Drdnght", + "abbreviation": "Cntmptr", "armour_value": { "standard": 50, "master_crafted": 55, From 5a45f1a6c17300da636322221a01ac7b507e1d58 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 16 Aug 2025 01:17:17 +0100 Subject: [PATCH 11/13] review points --- objects/obj_shop/Create_0.gml | 2 -- scripts/scr_ComplexSet/scr_ComplexSet.gml | 3 --- scripts/scr_marine_struct/scr_marine_struct.gml | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index fd20a76f1a..b41435bfbf 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -675,8 +675,6 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; - i += 1; - nobuy[i]=1; var mc = 0; repeat(i) { diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 6fb930cb82..9a846a75f8 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -754,14 +754,11 @@ function ComplexSet(_unit) constructor { static draw_weapon_and_hands = function() { if (armour_type == ArmourType.Dreadnought){ - show_debug_message("dread weapons"); if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); - show_debug_message("dread right"); } if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite)) { draw_sprite(weapon_left.sprite, 0, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); - show_debug_message("dread left"); } exit; } diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml index f663b4753d..b27b3d1198 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -905,7 +905,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} tags = get_gear_data("tags"); break; } - if (tags == false || !array_length(tags)){ + if (!is_array(tags) || array_length(tags) == 0){ return false; } else { return array_contains(tags, tag); @@ -2366,7 +2366,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} }; static is_dreadnought = function(){ - _arm_data = get_armour_data(); + var _arm_data = get_armour_data(); if (is_struct(_arm_data)){ if (_arm_data.has_tag("dreadnought")){ return true From 2ec0116a36cdb582e370c0b8604a4120bf693bf0 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 16 Aug 2025 03:17:39 +0100 Subject: [PATCH 12/13] final tweaks --- fonts/fnt_menu/fnt_menu.yy | 2 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 5 +++-- scripts/scr_culture_visuals/scr_culture_visuals.gml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fonts/fnt_menu/fnt_menu.yy b/fonts/fnt_menu/fnt_menu.yy index d529a1caec..0c8516b188 100644 --- a/fonts/fnt_menu/fnt_menu.yy +++ b/fonts/fnt_menu/fnt_menu.yy @@ -221,7 +221,7 @@ "ranges":[ {"lower":32,"upper":255,}, ], - "regenerateBitmap":true, + "regenerateBitmap":false, "resourceType":"GMFont", "resourceVersion":"2.0", "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 9a846a75f8..6a09a4d2d5 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -311,7 +311,8 @@ function ComplexSet(_unit) constructor { var _viable = false; var _tag_check_areas = struct_get_names(_mod.equipment_has_tag); for (var i=0; i Date: Sat, 16 Aug 2025 03:42:41 +0100 Subject: [PATCH 13/13] the actual final tweaks --- scripts/scr_ComplexSet/scr_ComplexSet.gml | 12 ++++++------ .../scr_culture_visuals/scr_culture_visuals.gml | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 6a09a4d2d5..6bcff52f56 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -163,7 +163,7 @@ function ComplexSet(_unit) constructor { } if (struct_exists(_exp_data, "scale")) { var _m_exp = _exp_data.exp_scale_max; - var _increment_count = _mod.max_saturation / 5; + var _increment_count = max(1, floor(_mod.max_saturation / 5)); var _increments = (_m_exp - _min) / _increment_count; var _sat_roof = _mod.max_saturation; var _mar_exp = unit.experience; @@ -171,9 +171,9 @@ function ComplexSet(_unit) constructor { if (_mar_exp >= _m_exp) { spawn_chance = _mod.max_saturation; } else { - var calc_exp = _mar_exp - _min; - var _inc_point = floor(_mar_exp / _increments); - _max_sat = _inc_point * 5; + var calc_exp = max(0, _mar_exp - _min); + var _inc_point = floor(calc_exp / _increments); + _max_sat = clamp(_inc_point * 5, 0, _mod.max_saturation); } } } @@ -397,7 +397,7 @@ function ComplexSet(_unit) constructor { var _roles = active_roles(); var tiers = [ ["Chapter Master"], - ["Forge Master", "Master of Sanctity", "Master of the Apothecarion", string("Chief {0}", _roles[eROLE.Librarian])], + ["Forge Master", "Master of Sanctity", "Master of the Apothecarion", $"Chief {_roles[eROLE.Librarian]}"], [_roles[eROLE.Captain], _roles[eROLE.HonourGuard]], [_roles[eROLE.Champion]], [_roles[eROLE.Ancient], _roles[eROLE.VeteranSergeant]], @@ -418,7 +418,7 @@ function ComplexSet(_unit) constructor { } if (_unit_tier >= _status_level) { var variation_tier = (_unit_tier - _status_level) + 1; - if (variation_map[$ _area] % variation_tier != 0) { + if (!struct_exists(variation_map, _area) || variation_map[$ _area] % variation_tier != 0) { return false; } } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index c0caeb3fae..df44ea4fc3 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -244,17 +244,17 @@ global.modular_drawing_items = [ prevent_others : true, }, { - position : "robes", + position : "robe", body_types: [0], sprite:spr_binders_robe, - role_type: SPECIALISTS_LIBRARIANS, + role_type: [SPECIALISTS_LIBRARIANS], max_saturation:10, }, { - position : "robes", + position : "robe", body_types: [0], sprite:spr_binders_robe, - role_type: SPECIALISTS_LIBRARIANS, + role_type: [SPECIALISTS_LIBRARIANS], max_saturation:40, chapter_adv : ["Favoured By The Warp","Warp Touched"], chapter_disadv : ["Warp Tainted"], @@ -264,7 +264,7 @@ global.modular_drawing_items = [ position : "belt", body_types: [0], sprite:spr_binders_belt, - role_type: SPECIALISTS_LIBRARIANS, + role_type: [SPECIALISTS_LIBRARIANS], chapter_adv : ["Favoured By The Warp","Warp Touched"], chapter_disadv : ["Warp Tainted"], allow_either :["chapter_adv","chapter_disadv"], @@ -1457,7 +1457,7 @@ function DummyMarine()constructor{ } static has_trait = marine_has_trait; static is_dreadnought = function(){ - _arm_data = gear_weapon_data("armour", last_armour); + var _arm_data = gear_weapon_data("armour", last_armour); if (is_struct(_arm_data)){ if (_arm_data.has_tag("dreadnought")){ return true @@ -1887,7 +1887,7 @@ base: { sprite: spr_weapon_lasca, }, { - sprite: spr_dread_plasma_cannon, + sprite: spr_dread_lascannon, body_types: [3], armours : ["Dreadnought"], }