diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 09fa95f3cb..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",},}, @@ -1103,8 +1106,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",},}, @@ -1116,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",},}, @@ -1202,6 +1210,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 +1543,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 +1661,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/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/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 8fa9d20615..b41435bfbf 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,24 @@ 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; + 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..6bcff52f56 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -134,269 +134,310 @@ 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 = variable_clone(_mod.allow_either); + } + 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 = 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; + + if (_mar_exp >= _m_exp) { + spawn_chance = _mod.max_saturation; + } else { + 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); } - 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("role_type")) { + return false; } - - if (!array_contains(_mod.body_types, armour_type)) { - if (!check_exception("body_types")) { - continue; - } + } + } + if (struct_exists(_mod, "roles")) { + if (!array_contains(_mod.roles, unit.role())) { + if (!check_exception("roles")) { + 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, "cultures")) { + if (!scr_has_style(_mod.cultures)) { + if (!check_exception("cultures")) { + return false; } - if (struct_exists(_mod, "roles")) { - if (!array_contains(_mod.roles, unit.role())) { - if (!check_exception("roles")) { - continue; - } - } + } + } + if (struct_exists(_mod, "company")) { + if (!array_contains(_mod.company, unit.company)) { + if (!check_exception("company")) { + return false; } - if (struct_exists(_mod, "cultures")) { - if (!scr_has_style(_mod.cultures)) { - if (!check_exception("cultures")) { - continue; - } - } + } + } + if (struct_exists(_mod, "armours")) { + if (!array_contains(_mod.armours, unit_armour)) { + if (!check_exception("armours")) { + return false; } - if (struct_exists(_mod, "company")) { - if (!array_contains(_mod.company, unit.company)) { - if (!check_exception("company")) { - 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")) { - if (!array_contains(_mod.armours, unit_armour)) { - if (!check_exception("armours")) { - 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_exclude")) { - if (array_contains(_mod.armours_exclude, unit_armour)) { - if (!check_exception("armours_exclude")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + return false; } - 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 (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_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 (!_viable) { + if (!check_exception("chapter_disadv")) { + return false; } - if (struct_exists(_mod, "stats")) { - if (!stat_valuator(_mod.stats, unit)) { - if (!check_exception("stats")) { - 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")) { - continue; - } - } + } + } + 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, "equipment_has_tag")) { + var _viable = false; + var _tag_check_areas = struct_get_names(_mod.equipment_has_tag); + for (var i=0; i= _status_level) { - var variation_tier = (_unit_tier - _status_level) + 1; - if (variation_map[$ _area] % variation_tier != 0) { - continue; - } + return false; + } + 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", $"Chief {_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]] + ]; + + 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 (!struct_exists(variation_map, _area) || variation_map[$ _area] % variation_tier != 0) { + return false; + } + } + } + + 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 +449,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 +517,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 +527,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 +542,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 +597,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 +630,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 +651,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 +754,15 @@ function ComplexSet(_unit) constructor { }; static draw_weapon_and_hands = function() { + if (armour_type == ArmourType.Dreadnought){ + 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); + } + 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); + } + 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 +994,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 +1030,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 +1261,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 +1358,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 +1374,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..df44ea4fc3 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -243,6 +243,33 @@ global.modular_drawing_items = [ cultures: ["Alpha"], prevent_others : true, }, + { + position : "robe", + body_types: [0], + sprite:spr_binders_robe, + role_type: [SPECIALISTS_LIBRARIANS], + max_saturation:10, + }, + { + position : "robe", + body_types: [0], + sprite:spr_binders_robe, + role_type: [SPECIALISTS_LIBRARIANS], + max_saturation:40, + chapter_adv : ["Favoured By The Warp","Warp Touched"], + chapter_disadv : ["Warp Tainted"], + allow_either :["chapter_adv","chapter_disadv"], + }, + { + position : "belt", + body_types: [0], + sprite:spr_binders_belt, + role_type: [SPECIALISTS_LIBRARIANS], + chapter_adv : ["Favoured By The Warp","Warp Touched"], + chapter_disadv : ["Warp Tainted"], + allow_either :["chapter_adv","chapter_disadv"], + max_saturation:50, + }, { position : "crown", body_types: [0], @@ -323,14 +350,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", @@ -473,8 +498,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, @@ -500,7 +526,9 @@ global.modular_drawing_items = [ sprite : spr_marksmans_honor, body_types :[0,2], position : "purity_seals", - stats : [["ballistic_skill", 50, "exmore"]] + stats : [ + ["ballistic_skill", 50, "exmore"] + ] }, { sprite : spr_crux_on_chain, @@ -540,6 +568,16 @@ global.modular_drawing_items = [ min : 100, }, }, + { + sprite : spr_crux_belt_fancy, + body_types :[0, 2], + position : "belt", + armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour", "Tartaros"], + assign_by_rank : 3, + exp : { + min : 100, + }, + }, { cultures : ["Knightly", "Crusader"], sprite : spr_mk7_rope_belt, @@ -575,7 +613,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, @@ -1218,7 +1259,7 @@ global.modular_drawing_items = [ spr_cata_shoulder_hanging_mail_left, "tabbard": spr_cata_tabbard_mail - }, + }, }, { @@ -1249,7 +1290,65 @@ 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, + } + } + + }, + { + position : "backpack_decoration", + sprite : spr_angelic_wings, + body_types : [0,1], + cultures : ["Angelic"], + assign_by_rank : 2, + equipment_has_tag : { + "gear" : "jump", + } + }, ]; @@ -1357,7 +1456,15 @@ function DummyMarine()constructor{ return is_specialist(role(), search_type,include_trainee, include_heads); } static has_trait = marine_has_trait; - + static is_dreadnought = function(){ + var _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; } @@ -1743,6 +1850,11 @@ base: { }, variants : [{ sprite: spr_weapon_assca, + }, + { + sprite: spr_weapon_assca, + body_types: [3], + armours : ["Dreadnought"], }], }, "Heavy Flamer": { @@ -1773,9 +1885,97 @@ base: { variants: [ { sprite: spr_weapon_lasca, + }, + { + sprite: spr_dread_lascannon, + 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 +1986,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 +2042,7 @@ base: { }, variants: [{ sprite: spr_weapon_boltpis, - }] + }], }, "Infernus Pistol": { @@ -1988,9 +2232,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 +2260,11 @@ base: { }, sprite: spr_weapon_plasc, body_types: [0, 1] + }, + { + sprite: spr_dread_plasma_cannon, + body_types: [3], + armours : ["Dreadnought"], } ] }, @@ -2188,6 +2444,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..b27b3d1198 100644 --- a/scripts/scr_marine_struct/scr_marine_struct.gml +++ b/scripts/scr_marine_struct/scr_marine_struct.gml @@ -886,7 +886,31 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} alter_equipment(start_gear, true, true); } } - + static equipment_has_tag = function(tag, area){ + var tags = []; + switch (area){ + case "wep1": + tags = get_weapon_one_data("tags"); + break; + case "wep2": + tags = get_weapon_two_data("tags"); + break; + case "mobi": + tags = get_mobility_data("tags"); + break; + case "armour": + tags = get_armour_data("tags"); + break; + case "gear": + tags = get_gear_data("tags"); + break; + } + if (!is_array(tags) || array_length(tags) == 0){ + return false; + } else { + return array_contains(tags, tag); + } + } static equipment_maintenance_burden = function() { var burden = 0.0; burden += get_armour_data("maintenance"); @@ -2341,8 +2365,18 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } }; + static is_dreadnought = function(){ + var _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..08d79c4c40 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(""); @@ -443,5 +443,31 @@ function unit_has_equipped(check_equippment){ return true; } +function equipment_has_tag(tag, area){ + var tags = []; + switch (area){ + case "wep1": + tags = get_weapon_one_data("tags"); + break; + case "wep2": + tags = get_weapon_two_data("tags"); + break; + case "mobi": + tags = get_mobility_data("tags"); + break; + case "armour": + tags = get_armour_data("tags"); + break; + case "gear": + tags = get_gear_data("tags"); + break; + } + if (tags == false || !array_length(tags)){ + return false; + } else { + return array_contains(tags, tag); + } +} + diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 2c7e1ebaf7..589dd49a6c 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": "Cntmptr", + "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_angelic_wings/c5bc43cd-b567-4673-92b9-efede7a0b44f.png b/sprites/spr_angelic_wings/c5bc43cd-b567-4673-92b9-efede7a0b44f.png new file mode 100644 index 0000000000..bbee1b088d Binary files /dev/null and b/sprites/spr_angelic_wings/c5bc43cd-b567-4673-92b9-efede7a0b44f.png differ 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 0000000000..bbee1b088d Binary files /dev/null and b/sprites/spr_angelic_wings/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png differ 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 0000000000..eb713baadf Binary files /dev/null and b/sprites/spr_binders_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ 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 0000000000..eb713baadf Binary files /dev/null and b/sprites/spr_binders_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ 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 0000000000..8d854d697f Binary files /dev/null and b/sprites/spr_binders_robe/c00a412a-a9bc-45ec-9142-9d8a013a975a.png differ 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 0000000000..8d854d697f Binary files /dev/null and b/sprites/spr_binders_robe/layers/c00a412a-a9bc-45ec-9142-9d8a013a975a/0b5e7fba-d4a1-441e-a726-f45a72c56663.png differ 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_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 0000000000..8d5f84a1a4 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png differ diff --git a/sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png b/sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png new file mode 100644 index 0000000000..cf3e380af8 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png differ 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 0000000000..8d5f84a1a4 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ diff --git a/sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png new file mode 100644 index 0000000000..cf3e380af8 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ 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 0000000000..d0f4a7d105 Binary files /dev/null and b/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png differ diff --git a/sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png b/sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png new file mode 100644 index 0000000000..d0f4a7d105 Binary files /dev/null and b/sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png differ diff --git a/sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy b/sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy new file mode 100644 index 0000000000..3ea3c2fdea --- /dev/null +++ b/sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_CCW", + "bboxMode":0, + "bbox_bottom":173, + "bbox_left":34, + "bbox_right":159, + "bbox_top":84, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","name":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"be470e13-bbeb-41d1-ae61-263c91abbae3","blendMode":0,"displayName":"default","isLocked":false,"name":"be470e13-bbeb-41d1-ae61-263c91abbae3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_CCW", + "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_CCW", + "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_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 0000000000..0dbe722fa3 Binary files /dev/null and b/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png differ 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 0000000000..0dbe722fa3 Binary files /dev/null and b/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png differ 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 0000000000..1adb141291 Binary files /dev/null and b/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png differ 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 0000000000..1adb141291 Binary files /dev/null and b/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png differ 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_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 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_other/380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png differ 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 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_other/layers/380cd3fb-d188-44e1-8e61-f3d7c0c8f526/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png differ 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 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_slate/6d4b0fe4-2d29-43cc-9838-317bd93abc41.png differ 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 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_slate/layers/6d4b0fe4-2d29-43cc-9838-317bd93abc41/edca4948-39ec-4e5f-ab97-4d1d7c174675.png differ 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 0000000000..ebc56a0275 Binary files /dev/null and b/sprites/spr_crux_belt_fancy/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png differ diff --git a/sprites/spr_crux_belt_fancy/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png b/sprites/spr_crux_belt_fancy/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_crux_belt_fancy/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png differ 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 0000000000..ebc56a0275 Binary files /dev/null and b/sprites/spr_crux_belt_fancy/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png differ diff --git a/sprites/spr_crux_belt_fancy/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png b/sprites/spr_crux_belt_fancy/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_crux_belt_fancy/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png differ 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_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_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_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 5d49b59102..5edd5e96aa 100644 Binary files a/sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png and b/sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png differ diff --git a/sprites/spr_gear_apoth/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png b/sprites/spr_gear_apoth_eye/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png similarity index 100% rename from sprites/spr_gear_apoth/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png rename to sprites/spr_gear_apoth_eye/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png diff --git a/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy b/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy new file mode 100644 index 0000000000..87391fe031 --- /dev/null +++ b/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy @@ -0,0 +1,92 @@ +{ + "$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 fb7035010b..5573062f6e 100644 Binary files a/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png and b/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png differ 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 245943e9a5..a28266c3d8 100644 Binary files a/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png and b/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png differ 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 fb7035010b..5573062f6e 100644 Binary files a/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png and b/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ 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 245943e9a5..a28266c3d8 100644 Binary files a/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png and b/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ 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_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_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_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png b/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png index 3bd309f808..f9198ae1c5 100644 Binary files a/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png and b/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png differ diff --git a/sprites/spr_pack_brazier3/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png b/sprites/spr_pack_brazier3/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png new file mode 100644 index 0000000000..1a9daf9c4b Binary files /dev/null and b/sprites/spr_pack_brazier3/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png differ 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 3bd309f808..f9198ae1c5 100644 Binary files a/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png and b/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png differ diff --git a/sprites/spr_pack_brazier3/layers/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b/23f60daa-fe76-4e85-9875-adbeb4cce378.png b/sprites/spr_pack_brazier3/layers/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b/23f60daa-fe76-4e85-9875-adbeb4cce378.png new file mode 100644 index 0000000000..1a9daf9c4b Binary files /dev/null and b/sprites/spr_pack_brazier3/layers/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b/23f60daa-fe76-4e85-9875-adbeb4cce378.png differ 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 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_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png b/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png new file mode 100644 index 0000000000..1abd8ff743 Binary files /dev/null and b/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png differ 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 0000000000..e1666a5313 Binary files /dev/null and b/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png differ 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 0000000000..58dc547f3d Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png differ diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png new file mode 100644 index 0000000000..0cdf0b209a Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png differ diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png new file mode 100644 index 0000000000..4ebee00e69 Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png differ 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 0000000000..ca49a8f02c Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png differ 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 0000000000..ca49a8f02c Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png differ 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_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_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 0000000000..78ae7850ce Binary files /dev/null and b/sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png differ 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 0000000000..78ae7850ce Binary files /dev/null and b/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png differ 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 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,